fix #17 to avoid watch an undefined value.

lordfriend · Dec 2, 2014 · a7f88e7 · a7f88e7
1 parent daa661f
commit a7f88e7
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 37 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "main": [
     "dist/js/nya-bs-select.js",
     "dist/css/nya-bs-select.css"

diff --git a/dist/css/nya-bs-select.css b/dist/css/nya-bs-select.css
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.0
+ * nya-bootstrap-select v2.0.1
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */

diff --git a/dist/css/nya-bs-select.min.css b/dist/css/nya-bs-select.min.css
diff --git a/dist/js/nya-bs-select.js b/dist/js/nya-bs-select.js
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.0
+ * nya-bootstrap-select v2.0.1
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -426,23 +426,24 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', functio
             return !value || value.length === 0;
           };
         }
-
-        $scope.$watch($attrs.disabled, function(disabled){
-          if(!!disabled) {
-            dropdownToggle.addClass('disabled');
-            previousTabIndex = dropdownToggle.attr('tabindex');
-            dropdownToggle.attr('tabindex', '-1');
-            isDisabled = true;
-          } else {
-            dropdownToggle.removeClass('disabled');
-            if(previousTabIndex) {
-              dropdownToggle.attr('tabindex', previousTabIndex);
+        if(typeof $attrs.disabled !== 'undefined') {
+          $scope.$watch($attrs.disabled, function(disabled){
+            if(!!disabled) {
+              dropdownToggle.addClass('disabled');
+              previousTabIndex = dropdownToggle.attr('tabindex');
+              dropdownToggle.attr('tabindex', '-1');
+              isDisabled = true;
             } else {
-              dropdownToggle.removeAttr('tabindex');
+              dropdownToggle.removeClass('disabled');
+              if(previousTabIndex) {
+                dropdownToggle.attr('tabindex', previousTabIndex);
+              } else {
+                dropdownToggle.removeAttr('tabindex');
+              }
+              isDisabled = false;
             }
-            isDisabled = false;
-          }
-        });
+          });
+        }
 
         /**
          * Do some check on modelValue. remove no existing value

diff --git a/dist/js/nya-bs-select.min.js b/dist/js/nya-bs-select.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "An angular directive wraps bootstrap-select",
   "repository": {
     "type": "git",

diff --git a/src/nya-bs-select.js b/src/nya-bs-select.js
@@ -114,23 +114,24 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', functio
             return !value || value.length === 0;
           };
         }
-
-        $scope.$watch($attrs.disabled, function(disabled){
-          if(!!disabled) {
-            dropdownToggle.addClass('disabled');
-            previousTabIndex = dropdownToggle.attr('tabindex');
-            dropdownToggle.attr('tabindex', '-1');
-            isDisabled = true;
-          } else {
-            dropdownToggle.removeClass('disabled');
-            if(previousTabIndex) {
-              dropdownToggle.attr('tabindex', previousTabIndex);
+        if(typeof $attrs.disabled !== 'undefined') {
+          $scope.$watch($attrs.disabled, function(disabled){
+            if(!!disabled) {
+              dropdownToggle.addClass('disabled');
+              previousTabIndex = dropdownToggle.attr('tabindex');
+              dropdownToggle.attr('tabindex', '-1');
+              isDisabled = true;
             } else {
-              dropdownToggle.removeAttr('tabindex');
+              dropdownToggle.removeClass('disabled');
+              if(previousTabIndex) {
+                dropdownToggle.attr('tabindex', previousTabIndex);
+              } else {
+                dropdownToggle.removeAttr('tabindex');
+              }
+              isDisabled = false;
             }
-            isDisabled = false;
-          }
-        });
+          });
+        }
 
         /**
          * Do some check on modelValue. remove no existing value