update to 2.0.5, update document.

lordfriend · Dec 15, 2014 · a7e33ca · a7e33ca
1 parent ffdc3c8
commit a7e33ca
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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.4
+ * nya-bootstrap-select v2.0.5
  * 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.4
+ * nya-bootstrap-select v2.0.5
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -1246,7 +1246,14 @@ nyaBsSelect.directive('nyaBsOption', ['$parse', function($parse){
         // hasOwnProperty.
         var lastBlockMap = createMap();
 
-        $scope.$watchCollection(collectionExp, function nyaBsOptionAction(collection) {
+        // deepWatch will impact performance. use with caution.
+        if($attr.deepWatch === 'true') {
+          $scope.$watch(collectionExp, nyaBsOptionAction, true);
+        } else {
+          $scope.$watchCollection(collectionExp, nyaBsOptionAction);
+        }
+
+        function nyaBsOptionAction(collection) {
           var index,
 
             previousNode = $element[0],     // node that cloned nodes should be inserted after
@@ -1429,7 +1436,7 @@ nyaBsSelect.directive('nyaBsOption', ['$parse', function($parse){
           lastBlockMap = nextBlockMap;
 
           nyaBsSelectCtrl.onCollectionChange(values);
-        });
+        }
       };
     }
   }

diff --git a/dist/js/nya-bs-select.min.js b/dist/js/nya-bs-select.min.js
diff --git a/docs/dist/css/main.css b/docs/dist/css/main.css
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.4
+ * nya-bootstrap-select v2.0.5
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */

diff --git a/docs/dist/css/nya-bs-select.css b/docs/dist/css/nya-bs-select.css
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.4
+ * nya-bootstrap-select v2.0.5
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -179,6 +179,11 @@
 .nya-bs-select .bs-searchbox input.form-control {
   margin-bottom: 0;
   width: 100%;
+  float: none;
+  z-index: inherit;
+  display: block;
+  position: static;
+  border-radius: 4px;
 }
 .nya-bs-select.fit-width .btn .filter-option {
   position: static;

diff --git a/docs/dist/js/nya-bs-select.js b/docs/dist/js/nya-bs-select.js
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.4
+ * nya-bootstrap-select v2.0.5
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -390,7 +390,7 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', functio
         //  dropdownToggle.addClass(className);
         //}
 
-        if(className = 'form-control') {
+        if(className === 'form-control') {
           dropdownToggle.addClass(className);
         }
       });
@@ -586,6 +586,7 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', functio
             searchBox.children().eq(0)[0].focus();
             nyaBsOptionNode = findFocus(true);
             if(nyaBsOptionNode) {
+              dropdownMenu.children().removeClass('active');
               jqLite(nyaBsOptionNode).addClass('active');
             }
           } else if($element.hasClass('open')) {
@@ -736,6 +737,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', functio
                 // find the focusable node but we will use active
                 nyaBsOptionNode = findFocus(true);
                 if(nyaBsOptionNode) {
+                  // remove previous active state
+                  dropdownMenu.children().removeClass('active');
+                  // set active to first focusable element
                   jqLite(nyaBsOptionNode).addClass('active');
                 }
               } else {
@@ -1242,7 +1246,14 @@ nyaBsSelect.directive('nyaBsOption', ['$parse', function($parse){
         // hasOwnProperty.
         var lastBlockMap = createMap();
 
-        $scope.$watchCollection(collectionExp, function nyaBsOptionAction(collection) {
+        // deepWatch will impact performance. use with caution.
+        if($attr.deepWatch === 'true') {
+          $scope.$watch(collectionExp, nyaBsOptionAction, true);
+        } else {
+          $scope.$watchCollection(collectionExp, nyaBsOptionAction);
+        }
+
+        function nyaBsOptionAction(collection) {
           var index,
 
             previousNode = $element[0],     // node that cloned nodes should be inserted after
@@ -1425,7 +1436,7 @@ nyaBsSelect.directive('nyaBsOption', ['$parse', function($parse){
           lastBlockMap = nextBlockMap;
 
           nyaBsSelectCtrl.onCollectionChange(values);
-        });
+        }
       };
     }
   }

diff --git a/docs/src/content/api/nya-bs-option.md b/docs/src/content/api/nya-bs-option.md
@@ -75,7 +75,8 @@ as attribute:
 ```html
 <li
   nya-bs-option=""
-  [value=""]>
+  [value=""]
+  [deep-watch=""]>
   <a>
     ...
   </a>
@@ -158,5 +159,14 @@ as attribute:
       </p>
     </td>
   </tr>
+  <tr>
+    <td>deep-watch</td>
+    <td><span class="label label-primary">string</span></td>
+    <td>
+      When set to true, enable a deep watch to collection_expression. `nya-bs-option` will use $watch(exp, listener, true) to make a deep watch. Turn on this feature will impact the performance. even cause expection.
+      It is not recommended.
+      By default. `nya-bs-option` will use $watchCollection to watch the collection_expression.
+    </td>
+  </tr>
 </tbody>
 </table>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "An angular directive wraps bootstrap-select",
   "repository": {
     "type": "git",