fix #117

build a new version
lordfriend · May 7, 2016 · 6eb0b88 · 6eb0b88
1 parent 68d222b
commit 6eb0b88
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "main": [
     "dist/js/nya-bs-select.js",
     "dist/css/nya-bs-select.css"
@@ -30,4 +30,4 @@
     "angular-ui-router": "~0.2.11",
     "angular-translate": "^2.9.0"
   }
-}
+}
diff --git a/dist/css/nya-bs-select.css b/dist/css/nya-bs-select.css
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.1.5
+ * nya-bootstrap-select v2.1.6
  * 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.1.5
+ * nya-bootstrap-select v2.1.6
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -336,7 +336,7 @@ nyaBsSelect.provider('nyaBsConfig', function() {
     'en-us': {
       defaultNoneSelection: 'Nothing selected',
       noSearchResult: 'NO SEARCH RESULT',
-      numberItemSelected: '%d item selected',
+      numberItemSelected: '%d items selected',
       selectAll: 'Select All',
       deselectAll: 'Deselect All'
     }
@@ -1131,7 +1131,7 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
             wv,
             viewValue;
 
-          liElements = dropdownMenu.find('li');
+          liElements = dropdownMenu[0].querySelectorAll('.nya-bs-option');
           if (liElements.length > 0) {
             wv = ngCtrl.$viewValue;
 

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.1.5
+ * nya-bootstrap-select v2.1.6
  * 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.1.5
+ * nya-bootstrap-select v2.1.6
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */

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.1.5
+ * nya-bootstrap-select v2.1.6
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -336,7 +336,7 @@ nyaBsSelect.provider('nyaBsConfig', function() {
     'en-us': {
       defaultNoneSelection: 'Nothing selected',
       noSearchResult: 'NO SEARCH RESULT',
-      numberItemSelected: '%d item selected',
+      numberItemSelected: '%d items selected',
       selectAll: 'Select All',
       deselectAll: 'Deselect All'
     }
@@ -1131,7 +1131,7 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
             wv,
             viewValue;
 
-          liElements = dropdownMenu.find('li');
+          liElements = dropdownMenu[0].querySelectorAll('.nya-bs-option');
           if (liElements.length > 0) {
             wv = ngCtrl.$viewValue;
 

diff --git a/examples/index.html b/examples/index.html
@@ -540,6 +540,35 @@ <h3>ngModelOptions</h3>
       </ol>
       <div class="form-static-control">{{model9}}</div>
     </form>
+
+    <h3>actionsBoxExample</h3>
+    <p>should work with action-box="true"</p>
+
+    <form class="form-inline">
+      <ol id="actionsBoxExample" class="nya-bs-select" ng-model="model10" multiple actions-box="true">
+        <li nya-bs-option="option in options2">
+          <a>
+            {{option}}
+            <span class="glyphicon glyphicon-ok check-mark"></span>
+          </a>
+        </li>
+      </ol>
+      <div class="form-static-control">{{model10}}</div>
+    </form>
+
+    <p>should work with action-box="true" and live-search="true"</p>
+
+    <form class="form-inline">
+      <ol id="actionBoxWithLiveSearchExample" class="nya-bs-select" ng-model="model11" multiple actions-box="true" data-live-search="true">
+        <li nya-bs-option="option in options2">
+          <a>
+            {{option}}
+            <span class="glyphicon glyphicon-ok check-mark"></span>
+          </a>
+        </li>
+      </ol>
+      <div class="form-static-control">{{model11}}</div>
+    </form>
   </section>
 </div>
 <footer class="footer">

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nya-bootstrap-select",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "An angular directive wraps bootstrap-select",
   "repository": {
     "type": "git",

diff --git a/src/nya-bs-select.js b/src/nya-bs-select.js
@@ -721,7 +721,7 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', '$compi
             wv,
             viewValue;
 
-          liElements = dropdownMenu.find('li');
+          liElements = dropdownMenu[0].querySelectorAll('.nya-bs-option');
           if (liElements.length > 0) {
             wv = ngCtrl.$viewValue;