From a47c7548b043049e8c94364c7b190191da9ff317 Mon Sep 17 00:00:00 2001 From: Tobias Lehr Date: Thu, 17 Dec 2015 17:44:01 +0100 Subject: [PATCH 1/3] ng-disabled should work now --- angular-toggle-switch.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js index 5260aef..1ba9f35 100644 --- a/angular-toggle-switch.js +++ b/angular-toggle-switch.js @@ -9,6 +9,7 @@ var self = this; this.$get = function() { return { + disabled: '=ngdisabled', onLabel: self.onLabel, offLabel: self.offLabel, knobLabel: self.knobLabel @@ -44,6 +45,15 @@ link: function(scope, element, attrs, ngModelCtrl){ var KEY_SPACE = 32; + attrs.$observe('disabled', function (disabled) { + if (disabled === 'true' || disabled) { + isEnabled = false; + } else { + isEnabled = true; + } + scope.disabled = disabled; + }); + element.on('click', function() { scope.$apply(scope.toggle); }); From c8b490dd874ffe963b4b5d83e03ac7497363affd Mon Sep 17 00:00:00 2001 From: tobi Date: Thu, 17 Dec 2015 22:42:01 +0100 Subject: [PATCH 2/3] minor changes from @zachlysobey --- angular-toggle-switch.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js index 1ba9f35..05b89f2 100644 --- a/angular-toggle-switch.js +++ b/angular-toggle-switch.js @@ -9,7 +9,7 @@ var self = this; this.$get = function() { return { - disabled: '=ngdisabled', + disabled: '=ngDisabled', onLabel: self.onLabel, offLabel: self.offLabel, knobLabel: self.knobLabel @@ -46,11 +46,7 @@ var KEY_SPACE = 32; attrs.$observe('disabled', function (disabled) { - if (disabled === 'true' || disabled) { - isEnabled = false; - } else { - isEnabled = true; - } + isEnabled=!disabled scope.disabled = disabled; }); From 01155ca77c82441bf436163cad79fd9126b0146e Mon Sep 17 00:00:00 2001 From: tobi Date: Thu, 17 Dec 2015 22:51:17 +0100 Subject: [PATCH 3/3] added missing semicolon --- angular-toggle-switch.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/angular-toggle-switch.js b/angular-toggle-switch.js index 05b89f2..16c1c06 100644 --- a/angular-toggle-switch.js +++ b/angular-toggle-switch.js @@ -46,7 +46,7 @@ var KEY_SPACE = 32; attrs.$observe('disabled', function (disabled) { - isEnabled=!disabled + isEnabled=!disabled; scope.disabled = disabled; });