spinjs-rails 1.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cab3c4707629b7189d91c3f992d57fb01cca8422
-  data.tar.gz: d72a699a9019fea04ac8754516631f53a344750a
+  metadata.gz: 48f5d157bcfa2950dc5827138b5f1d411dbc7c8c
+  data.tar.gz: 45efc0f47f81873ff545197709e06ad2826786a0
 SHA512:
-  metadata.gz: 341eb4c352e75c21748716c1bb601b34652b806722a4d461485bbfd10ec087d8b2341e1e0e0afb8a5297952e0829580b8931159ba4a53b19f4b3fdf69eecddd3
-  data.tar.gz: b26f382c243b5944be120c3bf146b6b57c2545eaa845f7f582befe398a45673ea5ce04f4b823635973260a3dd7734cb8e396f25f62bddb89b93b5b49dad871f2
+  metadata.gz: 015f470e80dd47b4f3554c0b9b44186ed8581a300f08c54f27b8fba9c8e1136bf9f22f1d58487a5803dbef4b1b8d584164281470240efaa50ebaf66b208dfc50
+  data.tar.gz: c985e247b151f67917212401381c4d06252bce380b64c0bfa7c80284dd124e527aec50bc14c4d29da3f05c56f75a4a3cf977c14feedb7e79102eb1056d95dffa

data/lib/spinjs-rails/version.rb

@@ -1,5 +1,5 @@
 module Spinjs
   module Rails
-    VERSION = "1.3"
+    VERSION = "1.4"
   end
 end

data/vendor/assets/javascripts/jquery.spin.js

@@ -1,38 +1,80 @@
-//= require jquery
-//= require spin
-
-(function($) {
-	$.fn.spin = function(opts, color) {
-		var 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 }
-		};
-		if (Spinner) {
-			return this.each(function() {
-				var $this = $(this),
-					data = $this.data();
-				
-				if (data.spinner) {
-					data.spinner.stop();
-					delete data.spinner;
-				}
-				if (opts !== false) {
-					if (typeof opts === "string") {
-						if (opts in presets) {
-							opts = presets[opts];
-						} else {
-							opts = {};
-						}
-						if (color) {
-							opts.color = color;
-						}
-					}
-					data.spinner = new Spinner($.extend({color: $this.css('color')}, opts)).spin(this);
-				}
-			});
-		} else {
-			throw "Spinner class not available.";
-		}
-	};
-})(jQuery);
+/**
+ * Copyright (c) 2011-2014 Felix Gnass
+ * Licensed under the MIT license
+ */
+
+/*
+
+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(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
+        )
+        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 }
+  }
+
+}));

data/vendor/assets/javascripts/spin.js

@@ -1,7 +1,5 @@
-//fgnass.github.com/spin.js#v1.3
-
 /**
- * Copyright (c) 2011-2013 Felix Gnass
+ * Copyright (c) 2011-2014 Felix Gnass
  * Licensed under the MIT license
  */
 (function(root, factory) {
@@ -89,12 +87,12 @@
       , pp
       , i
 
-    if(s[prop] !== undefined) return prop
     prop = prop.charAt(0).toUpperCase() + prop.slice(1)
     for(i=0; i<prefixes.length; i++) {
       pp = prefixes[i]+prop
       if(s[pp] !== undefined) return pp
     }
+    if(s[prop] !== undefined) return prop
   }
 
   /**
@@ -130,6 +128,13 @@
     return o
   }
 
+  /**
+   * Returns the line color from the given string or array.
+   */
+  function getColor(color, idx) {
+    return typeof color == 'string' ? color : color[idx % color.length]
+  }
+
   // Built-in defaults
 
   var defaults = {
@@ -147,14 +152,13 @@
     fps: 20,              // Frames per second when using setTimeout()
     zIndex: 2e9,          // Use a high z-index by default
     className: 'spinner', // CSS class to assign to the element
-    top: 'auto',          // center vertically
-    left: 'auto',         // center horizontally
-    position: 'relative'  // element position
+    top: '50%',           // center vertically
+    left: '50%',          // center horizontally
+    position: 'absolute'  // element position
   }
 
   /** The constructor */
   function Spinner(o) {
-    if (typeof this == 'undefined') return new Spinner(o)
     this.opts = merge(o || {}, Spinner.defaults, defaults)
   }
 
@@ -175,17 +179,14 @@
         , o = self.opts
         , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
         , mid = o.radius+o.length+o.width
-        , ep // element position
-        , tp // target position
 
+      css(el, {
+        left: o.left,
+        top: o.top
+      })
+        
       if (target) {
         target.insertBefore(el, target.firstChild||null)
-        tp = pos(target)
-        ep = pos(el)
-        css(el, {
-          left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 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')
@@ -259,8 +260,7 @@
         })
 
         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)')))
+        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')))
       }
       return el
     },
@@ -314,7 +314,7 @@
                 top: -o.width>>1,
                 filter: filter
               }),
-              vml('fill', {color: o.color, opacity: o.opacity}),
+              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
               vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
             )
           )

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: spinjs-rails
 version: !ruby/object:Gem::Version
-  version: '1.3'
+  version: '1.4'
 platform: ruby
 authors:
 - Dmytrii Nagirniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 description: An animated CSS3 loading spinner with VML fallback for IE.
@@ -31,7 +31,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -52,17 +52,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: spinjs-rails
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A spinning activity indicator for Rails 3 with no images and CSS.