Updated switchery dependency to ~0.8.1 + more stable implementation o…

…f disabled attribute
servergrove · Nov 9, 2015 · 99e4a89 · 99e4a89
1 parent 4d7ec71
commit 99e4a89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-switchery",
-  "version": "1.0.0-alpha7",
+  "version": "1.0.0-alpha8",
   "main": "src/ng-switchery.js",
   "license": "MIT",
   "ignore": [
@@ -10,7 +10,7 @@
     "examples"
   ],
   "dependencies": {
-    "switchery": "~0.6.2"
+    "switchery": "~0.8.1"
   },
   "devDependencies": {
     "angular": "~1.2.19"

diff --git a/src/ng-switchery.js b/src/ng-switchery.js
@@ -15,7 +15,7 @@ angular.module('NgSwitchery', [])
          * @param scope
          * @param elem
          * @param attrs
-		 * @param ngModel
+         * @param ngModel
          */
         function linkSwitchery(scope, elem, attrs, ngModel) {
             if(!ngModel) return false;
@@ -25,15 +25,12 @@ angular.module('NgSwitchery', [])
             }
             catch (e) {}
             var switcher;
-            var previousDisabledValue;
-            // Watch for attribute changes to recreate the switch if the 'disabled' attribute changes
+
             attrs.$observe('disabled', function(value) {
-              if (value == undefined || value == previousDisabledValue) {
-                return;
-              } else {
-                previousDisabledValue = value;
-              }
-              initializeSwitch();
+              if (value)
+                switcher.disable();
+              else
+                switcher.enable();
             });
 
             function initializeSwitch() {