Merge pull request msurguy#17 from yhbyun/hotfixes/branch

Upgrade spin.js to verion 2.0.1 and add support for it
zesht · Jun 30, 2014 · 0f71342 · 0f71342
2 parents 9790e6e + 5941025
commit 0f71342
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 48 deletions.
diff --git a/bower.json b/bower.json
@@ -9,7 +9,7 @@
     ],
     "dependencies": {
         "bootstrap": ">=3.0.0",
-        "spin.js": "~1.3.2"
+        "spin.js": "~2.0.1"
     },
     "readme": "README.md",
     "repository": {

diff --git a/dist/ladda-themeless.css b/dist/ladda-themeless.css
@@ -311,7 +311,7 @@
 .ladda-button[data-style=contract-overlay] {
   overflow: hidden;
   width: 100px;
-  box-shadow: 0px 0px 0px 3000px rgba(0, 0, 0, 0); }
+  box-shadow: 0px 0px 0px 3000px transparent; }
 
 .ladda-button[data-style=contract-overlay] .ladda-spinner {
   left: 50%;

diff --git a/dist/ladda-themeless.min.css b/dist/ladda-themeless.min.css
diff --git a/dist/ladda.css b/dist/ladda.css
@@ -312,7 +312,7 @@
 .ladda-button[data-style=contract-overlay] {
   overflow: hidden;
   width: 100px;
-  box-shadow: 0px 0px 0px 3000px rgba(0, 0, 0, 0); }
+  box-shadow: 0px 0px 0px 3000px transparent; }
 
 .ladda-button[data-style=contract-overlay] .ladda-spinner {
   left: 50%;
@@ -347,7 +347,7 @@
   border: 1px solid transparent;
   -webkit-appearance: none;
   -webkit-font-smoothing: antialiased;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); }
+  -webkit-tap-highlight-color: transparent; }
   .ladda-button:hover {
     border-color: rgba(0, 0, 0, 0.07);
     background-color: #888; }

diff --git a/dist/ladda.js b/dist/ladda.js
@@ -2,7 +2,7 @@
     if (typeof exports === "object") {
         module.exports = factory();
     } else if (typeof define === "function" && define.amd) {
-        define([ "spin" ], factory);
+        define([ "./spin" ], factory);
     } else {
         root.Ladda = factory(root.Spinner);
     }
@@ -80,6 +80,9 @@
             },
             isLoading: function() {
                 return button.hasAttribute("data-loading");
+            },
+            getTarget: function() {
+                return button;
             }
         };
         ALL_INSTANCES.push(instance);
@@ -137,8 +140,8 @@
             length: length,
             width: width,
             zIndex: "auto",
-            top: "auto",
-            left: "auto",
+            top: "50%",
+            left: "50%",
             className: ""
         });
     }