Merge https://github.com/redmatrix/redmatrix into pending_merge

1 files changed, 25 insertions, 26 deletions

diff --git a/view/js/jquery.spin.js b/view/js/jquery.spin.js
index a35a27765..6b4fd656f 100644
--- a/view/js/jquery.spin.js
+++ b/view/js/jquery.spin.js
@@ -1,6 +1,7 @@
 /**
- * Copyright (c) 2011-2013 Felix Gnass
+ * Copyright (c) 2011-2014 Felix Gnass
  * Licensed under the MIT license
+ * http://spin.js.org/
  */
 
 /*
@@ -8,42 +9,40 @@
 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() // 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.
+$('#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.
+$('#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
+  lines:   9
+, length: 10
+, width:  20
+, radius:  0
 }
 
-$('#el').spin('flower', 'red');
+$('#el').spin('flower', 'red')
 
 */
 
-(function(factory) {
+;(function(factory) {
 
   if (typeof exports == 'object') {
     // CommonJS
-    factory(require('jquery'), require('spin'))
-  }
-  else if (typeof define == 'function' && define.amd) {
+    factory(require('jquery'), require('spin.js'))
+  } else if (typeof define == 'function' && define.amd) {
     // AMD, register as anonymous module
     define(['jquery', 'spin'], factory)
-  }
-  else {
+  } else {
     // Browser globals
     if (!window.Spinner) throw new Error('Spin.js not present')
     factory(window.jQuery, window.Spinner)
@@ -54,17 +53,17 @@ $('#el').spin('flower', 'red');
   $.fn.spin = function(opts, color) {
 
     return this.each(function() {
-      var $this = $(this),
-        data = $this.data();
+      var $this = $(this)
+        , data = $this.data()
 
       if (data.spinner) {
-        data.spinner.stop();
-        delete data.spinner;
+        data.spinner.stop()
+        delete data.spinner
       }
       if (opts !== false) {
         opts = $.extend(
-          { color: color || $this.css('color') },
-          $.fn.spin.presets[opts] || opts
+          { color: color || $this.css('color') }
+        , $.fn.spin.presets[opts] || opts
         )
         data.spinner = new Spinner(opts).spin(this)
       }
@@ -72,9 +71,9 @@ $('#el').spin('flower', 'red');
   }
 
   $.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 }
+    tiny:  { lines:  8, length: 2, width: 2, radius: 3, position: 'relative' }
+  , small: { lines:  8, length: 4, width: 3, radius: 5, position: 'relative' }
+  , large: { lines: 10, length: 8, width: 4, radius: 8, position: 'relative' }
   }
 
 }));