From 298d8f584d22993774d2cfbf1e514c86207ee89d Mon Sep 17 00:00:00 2001 From: George Stephanis Date: Thu, 6 Jun 2013 12:06:39 -0400 Subject: [PATCH] Updating spin.js to v1.3, and changing jquery.spin.js to the canonical version. Adding presets for backward compatability and a polyfill to support right-aligning the spinner. Bumping the versions. --- js/jquery.spin.js | 180 +++++++------ js/spin.js | 642 +++++++++++++++++++++++++--------------------- liveblog.php | 4 +- 3 files changed, 446 insertions(+), 380 deletions(-) diff --git a/js/jquery.spin.js b/js/jquery.spin.js index 4642af13a..1e901ca65 100644 --- a/js/jquery.spin.js +++ b/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 ); \ No newline at end of file +(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); diff --git a/js/spin.js b/js/spin.js index f506cd2bc..c66c607a7 100644 --- a/js/spin.js +++ b/js/spin.js @@ -1,301 +1,349 @@ -//fgnass.github.com/spin.js#v1.2.4 -(function(window, document, undefined) { +//fgnass.github.com/spin.js#v1.3 /** - * Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de] + * Copyright (c) 2011-2013 Felix Gnass * Licensed under the MIT license */ - - var prefixes = ['webkit', 'Moz', 'ms', 'O']; /* Vendor prefixes */ - var animations = {}; /* Animation rules keyed by their name */ - var useCssAnimations; - - /** - * Utility function to create elements. If no tag name is given, - * a DIV is created. Optionally properties can be passed. - */ - function createEl(tag, prop) { - var el = document.createElement(tag || 'div'); - var n; - - for(n in prop) { - el[n] = prop[n]; - } - return el; - } - - /** - * Appends children and returns the parent. - */ - function ins(parent /* child1, child2, ...*/) { - for (var i=1, n=arguments.length; i> 1) : o.left+mid) + 'px', - top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : o.top+mid) + 'px' - }); - } - - el.setAttribute('aria-role', 'progressbar'); - self.lines(el, self.opts); - - if (!useCssAnimations) { - // No CSS animation support, use setTimeout() instead - var i = 0; - var fps = o.fps; - var f = fps/o.speed; - var ostep = (1-o.opacity)/(f*o.trail / 100); - var astep = f/o.lines; - - !function anim() { - i++; - for (var s=o.lines; s; s--) { - var alpha = Math.max(1-(i+s*astep)%f * ostep, o.opacity); - self.opacity(el, o.lines-s, alpha, o); - } - self.timeout = self.el && setTimeout(anim, ~~(1000/fps)); - }(); - } - return self; - }, - stop: function() { - var el = this.el; - if (el) { - clearTimeout(this.timeout); - if (el.parentNode) el.parentNode.removeChild(el); - this.el = undefined; - } - return this; - }, - lines: function(el, o) { - var i = 0; - var seg; - - function fill(color, shadow) { - return css(createEl(), { - position: 'absolute', - width: (o.length+o.width) + 'px', - height: o.width + 'px', - background: color, - boxShadow: shadow, - transformOrigin: 'left', - transform: 'rotate(' + ~~(360/o.lines*i) + 'deg) translate(' + o.radius+'px' +',0)', - borderRadius: (o.width>>1) + 'px' - }); - } - for (; i < o.lines; i++) { - seg = css(createEl(), { - position: 'absolute', - top: 1+~(o.width/2) + 'px', - transform: o.hwaccel ? 'translate3d(0,0,0)' : '', - opacity: o.opacity, - animation: useCssAnimations && addAnimation(o.opacity, o.trail, i, o.lines) + ' ' + 1/o.speed + 's linear infinite' - }); - if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})); - ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))); - } - return el; - }, - opacity: function(el, i, val) { - if (i < el.childNodes.length) el.childNodes[i].style.opacity = val; - } - }; - - ///////////////////////////////////////////////////////////////////////// - // VML rendering for IE - ///////////////////////////////////////////////////////////////////////// - - /** - * Check and init VML support - */ - !function() { - var s = css(createEl('group'), {behavior: 'url(#default#VML)'}); - var i; - - if (!vendor(s, 'transform') && s.adj) { - - // VML support detected. Insert CSS rules ... - for (i=4; i--;) sheet.addRule(['group', 'roundrect', 'fill', 'stroke'][i], 'behavior:url(#default#VML)'); - - Spinner.prototype.lines = function(el, o) { - var r = o.length+o.width; - var s = 2*r; - - function grp() { - return css(createEl('group', {coordsize: s +' '+s, coordorigin: -r +' '+-r}), {width: s, height: s}); - } - - var margin = -(o.width+o.length)*2+'px'; - var g = css(grp(), {position: 'absolute', top: margin, left: margin}); - - var i; - - function seg(i, dx, filter) { - ins(g, - ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), - ins(css(createEl('roundrect', {arcsize: 1}), { - width: r, - height: o.width, - left: o.radius, - top: -o.width>>1, - filter: filter - }), - createEl('fill', {color: o.color, opacity: o.opacity}), - createEl('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change - ) - ) - ); - } - - if (o.shadow) { - for (i = 1; i <= o.lines; i++) { - seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)'); - } - } - for (i = 1; i <= o.lines; i++) seg(i); - return ins(el, g); - }; - Spinner.prototype.opacity = function(el, i, val, o) { - var c = el.firstChild; - o = o.shadow && o.lines || 0; - if (c && i+o < c.childNodes.length) { - c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild; - if (c) c.opacity = val; - } - }; - } - else { - useCssAnimations = vendor(s, 'animation'); - } - }(); - - window.Spinner = Spinner; - -})(window, document); \ No newline at end of file +(function(root, factory) { + + /* CommonJS */ + if (typeof exports == 'object') module.exports = factory() + + /* AMD module */ + else if (typeof define == 'function' && define.amd) define(factory) + + /* Browser global */ + else root.Spinner = factory() +} +(this, function() { + "use strict"; + + var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */ + , animations = {} /* Animation rules keyed by their name */ + , useCssAnimations /* Whether to use CSS animations or setTimeout */ + + /** + * Utility function to create elements. If no tag name is given, + * a DIV is created. Optionally properties can be passed. + */ + function createEl(tag, prop) { + var el = document.createElement(tag || 'div') + , n + + for(n in prop) el[n] = prop[n] + return el + } + + /** + * Appends children and returns the parent. + */ + function ins(parent /* child1, child2, ...*/) { + for (var i=1, n=arguments.length; i> 1) : parseInt(o.left, 10) + mid) + 'px', + top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px' + }) + } + + el.setAttribute('role', 'progressbar') + self.lines(el, self.opts) + + if (!useCssAnimations) { + // No CSS animation support, use setTimeout() instead + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , alpha + , fps = o.fps + , f = fps/o.speed + , ostep = (1-o.opacity) / (f*o.trail / 100) + , astep = f/o.lines + + ;(function anim() { + i++; + for (var j = 0; j < o.lines; j++) { + alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity) + + self.opacity(el, j * o.direction + start, alpha, o) + } + self.timeout = self.el && setTimeout(anim, ~~(1000/fps)) + })() + } + return self + }, + + /** + * Stops and removes the Spinner. + */ + stop: function() { + var el = this.el + if (el) { + clearTimeout(this.timeout) + if (el.parentNode) el.parentNode.removeChild(el) + this.el = undefined + } + return this + }, + + /** + * Internal method that draws the individual lines. Will be overwritten + * in VML fallback mode below. + */ + lines: function(el, o) { + var i = 0 + , start = (o.lines - 1) * (1 - o.direction) / 2 + , seg + + function fill(color, shadow) { + return css(createEl(), { + position: 'absolute', + width: (o.length+o.width) + 'px', + height: o.width + 'px', + background: color, + boxShadow: shadow, + transformOrigin: 'left', + transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)', + borderRadius: (o.corners * o.width>>1) + 'px' + }) + } + + for (; i < o.lines; i++) { + seg = css(createEl(), { + position: 'absolute', + top: 1+~(o.width/2) + 'px', + transform: o.hwaccel ? 'translate3d(0,0,0)' : '', + opacity: o.opacity, + animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite' + }) + + if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'})) + + ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)'))) + } + return el + }, + + /** + * Internal method that adjusts the opacity of a single line. + * Will be overwritten in VML fallback mode below. + */ + opacity: function(el, i, val) { + if (i < el.childNodes.length) el.childNodes[i].style.opacity = val + } + + }) + + + function initVML() { + + /* Utility function to create a VML tag */ + function vml(tag, attr) { + return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr) + } + + // No CSS transforms but VML support, add a CSS rule for VML elements: + sheet.addRule('.spin-vml', 'behavior:url(#default#VML)') + + Spinner.prototype.lines = function(el, o) { + var r = o.length+o.width + , s = 2*r + + function grp() { + return css( + vml('group', { + coordsize: s + ' ' + s, + coordorigin: -r + ' ' + -r + }), + { width: s, height: s } + ) + } + + var margin = -(o.width+o.length)*2 + 'px' + , g = css(grp(), {position: 'absolute', top: margin, left: margin}) + , i + + function seg(i, dx, filter) { + ins(g, + ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}), + ins(css(vml('roundrect', {arcsize: o.corners}), { + width: r, + height: o.width, + left: o.radius, + top: -o.width>>1, + filter: filter + }), + vml('fill', {color: o.color, opacity: o.opacity}), + vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change + ) + ) + ) + } + + if (o.shadow) + for (i = 1; i <= o.lines; i++) + seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)') + + for (i = 1; i <= o.lines; i++) seg(i) + return ins(el, g) + } + + Spinner.prototype.opacity = function(el, i, val, o) { + var c = el.firstChild + o = o.shadow && o.lines || 0 + if (c && i+o < c.childNodes.length) { + c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild + if (c) c.opacity = val + } + } + } + + var probe = css(createEl('group'), {behavior: 'url(#default#VML)'}) + + if (!vendor(probe, 'transform') && probe.adj) initVML() + else useCssAnimations = vendor(probe, 'animation') + + return Spinner + +})); diff --git a/liveblog.php b/liveblog.php index 1620b4856..b21faf8c3 100644 --- a/liveblog.php +++ b/liveblog.php @@ -506,8 +506,8 @@ public static function enqueue_scripts() { if ( wp_script_is( 'jquery.spin', 'registered' ) ) { wp_enqueue_script( 'jquery.spin' ); } else { - wp_enqueue_script( 'spin', plugins_url( 'js/spin.js', __FILE__ ), false, '1.2.4' ); - wp_enqueue_script( 'jquery.spin', plugins_url( 'js/jquery.spin.js', __FILE__ ), array( 'jquery', 'spin' ) ); + wp_enqueue_script( 'spin', plugins_url( 'js/spin.js', __FILE__ ), false, '1.3' ); + wp_enqueue_script( 'jquery.spin', plugins_url( 'js/jquery.spin.js', __FILE__ ), array( 'jquery', 'spin' ), '1.3' ); } wp_localize_script( self::key, 'liveblog_settings',