Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updating spin.js to v1.3, and changing jquery.spin.js to the canonica…
…l version. Adding presets for backward compatability and a polyfill to support right-aligning the spinner. Bumping the versions.
  • Loading branch information
George Stephanis committed Jun 6, 2013
1 parent 10b54c6 commit 298d8f5
Show file tree
Hide file tree
Showing 3 changed files with 446 additions and 380 deletions.
180 changes: 99 additions & 81 deletions js/jquery.spin.js
@@ -1,86 +1,104 @@
/*
* Matt Husby https://github.com/matthusby/spin.js
* Based on the jquery plugin by Bradley Smith
* https://gist.github.com/1290439
/**
* Copyright (c) 2011-2013 Felix Gnass
* Licensed under the MIT license
*/

/*
Add spin to the jQuery object
If color is not passed the spinner will be black
You can now create a spinner using any of the variants below:
$("#el").spin(); // Produces default Spinner
$("#el").spin("small"); // Produces a 'small' Spinner
$("#el").spin("large", "white"); // Produces a 'large' Spinner in white (or any valid CSS color).
$("#el").spin({ ... }); // Produces a Spinner using your custom settings.
$("#el").spin("small-right"); // Pin the small spinner to the right edge
$("#el").spin("{small, medium, large}-{left, right, top, bottom}"); // All options for where to pin
$("#el").spin(false); // Kills the spinner.
Basic Usage:
============
$('#el').spin(); // Creates a default Spinner using the text color of #el.
$('#el').spin({ ... }); // Creates a Spinner using the provided options.
$('#el').spin(false); // Stops and removes the spinner.
Using Presets:
==============
$('#el').spin('small'); // Creates a 'small' Spinner using the text color of #el.
$('#el').spin('large', '#fff'); // Creates a 'large' white Spinner.
Adding a custom preset:
=======================
$.fn.spin.presets.flower = {
lines: 9
length: 10
width: 20
radius: 0
}
$('#el').spin('flower', 'red');
*/

( function( $ ) {
$.fn.spin = function( opts, color ) {
var presets = {
"small": { lines: 8, length: 2, width: 2, radius: 3, trail: 60, speed: 1.3 },
"medium": { lines: 8, length: 4, width: 3, radius: 5, trail: 60, speed: 1.3 },
"large": { lines: 10, length: 6, width: 4, radius: 7, trail: 60, speed: 1.3 }
};
if ( Spinner ) {
return this.each( function() {
var $this = $( this ),
data = $this.data();

if ( data.spinner ) {
data.spinner.stop();
delete data.spinner;
}
if ( opts !== false ) {
var spinner_options;
if ( typeof opts === "string" ) {
var spinner_base = opts.indexOf( '-' );
if( spinner_base == -1 ) {
spinner_base = opts;
} else {
spinner_base = opts.substring( 0, spinner_base );
}
if ( spinner_base in presets ) {
spinner_options = presets[spinner_base];
} else {
spinner_options = {};
}
var padding;
if ( opts.indexOf( "-right" ) != -1 ) {
padding = jQuery( this ).css( 'padding-left' );
if( typeof padding === "undefined" ) {
padding = 0;
} else {
padding = padding.replace( 'px', '' );
}
spinner_options.left = jQuery( this ).outerWidth() - ( 2 * ( spinner_options.length + spinner_options.width + spinner_options.radius ) ) - padding - 5;
}
if ( opts.indexOf( '-left' ) != -1 ) {
spinner_options.left = 5;
}
if ( opts.indexOf( '-top' ) != -1 ) {
spinner_options.top = 5;
}
if ( opts.indexOf( '-bottom' ) != -1 ) {
padding = jQuery( this ).css( 'padding-top' );
if( typeof padding === "undefined" ) {
padding = 0;
} else {
padding = padding.replace( 'px', '' );
}
spinner_options.top = jQuery( this ).outerHeight() - ( 2 * ( spinner_options.length + spinner_options.width + spinner_options.radius ) ) - padding - 5;
}
}
if( color ){
spinner_options.color = color;
}
data.spinner = new Spinner( spinner_options ).spin( this );
}
});
} else {
throw "Spinner class not available.";
}
};
})( jQuery );
(function(factory) {

if (typeof exports == 'object') {
// CommonJS
factory(require('jquery'), require('spin'))
}
else if (typeof define == 'function' && define.amd) {
// AMD, register as anonymous module
define(['jquery', 'spin'], factory)
}
else {
// Browser globals
if (!window.Spinner) throw new Error('Spin.js not present')
factory(window.jQuery, window.Spinner)
}

}(function($, Spinner) {

$.fn.spin = function(opts, color) {

return this.each(function() {
var $this = $(this),
data = $this.data();

if (data.spinner) {
data.spinner.stop();
delete data.spinner;
}
if (opts !== false) {
opts = $.extend(
{ color: color || $this.css('color') },
$.fn.spin.presets[opts] || opts
)
// Begin WordPress Additions
// To use opts.right, you need to have specified a length, width, and radius.
if ( typeof opts.right !== 'undefined' && typeof opts.length !== 'undefined'
&& typeof opts.width !== 'undefined' && typeof opts.radius !== 'undefined' ) {
var pad = $this.css( 'padding-left' );
pad = ( typeof pad === 'undefined' ) ? 0 : parseInt( pad, 10 );
opts.left = $this.outerWidth() - ( 2 * ( opts.length + opts.width + opts.radius ) ) - pad - opts.right;
delete opts.right;
}
// End WordPress Additions
data.spinner = new Spinner(opts).spin(this)
}
})
}

$.fn.spin.presets = {
tiny: { lines: 8, length: 2, width: 2, radius: 3 },
small: { lines: 8, length: 4, width: 3, radius: 5 },
large: { lines: 10, length: 8, width: 4, radius: 8 }
}

}));

// Jetpack Presets Overrides:
(function($){
$.fn.spin.presets.wp = { trail: 60, speed: 1.3 };
$.fn.spin.presets.small = $.extend( { lines: 8, length: 2, width: 2, radius: 3 }, $.fn.spin.presets.wp );
$.fn.spin.presets.medium = $.extend( { lines: 8, length: 4, width: 3, radius: 5 }, $.fn.spin.presets.wp );
$.fn.spin.presets.large = $.extend( { lines: 10, length: 6, width: 4, radius: 7 }, $.fn.spin.presets.wp );
$.fn.spin.presets['small-left'] = $.extend( { left: 5 }, $.fn.spin.presets.small );
$.fn.spin.presets['small-right'] = $.extend( { right: 5 }, $.fn.spin.presets.small );
$.fn.spin.presets['medium-left'] = $.extend( { left: 5 }, $.fn.spin.presets.medium );
$.fn.spin.presets['medium-right'] = $.extend( { right: 5 }, $.fn.spin.presets.medium );
$.fn.spin.presets['large-left'] = $.extend( { left: 5 }, $.fn.spin.presets.large );
$.fn.spin.presets['large-right'] = $.extend( { right: 5 }, $.fn.spin.presets.large );
})(jQuery);

0 comments on commit 298d8f5

Please sign in to comment.