update version and document. fix #39

lordfriend · Mar 1, 2015 · e422ae5 · e422ae5
1 parent 8148477
commit e422ae5
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
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.8
+ * nya-bootstrap-select v2.0.9
  * 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/docs/dist/css/main.css b/docs/dist/css/main.css
@@ -1,5 +1,5 @@
 /**
- * nya-bootstrap-select v2.0.8
+ * nya-bootstrap-select v2.0.9
  * 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.8
+ * nya-bootstrap-select v2.0.9
  * 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.0.8
+ * nya-bootstrap-select v2.0.9
  * Copyright 2014 Nyasoft
  * Licensed under MIT license
  */
@@ -984,6 +984,13 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
             firstLiElement = dropdownMenu.children().eq(dropdownMenu.children().length - 1);
           }
 
+          // focus on selected element
+          for(var i = 0; i < dropdownMenu.children().length; i++) {
+            if(dropdownMenu.children().eq(i).hasClass('selected')) {
+              return dropdownMenu.children().eq(i)[0];
+            }
+          }
+
           if(firstLiElement.hasClass('nya-bs-option') && !firstLiElement.hasClass('disabled') && !firstLiElement.hasClass('not-match')) {
             return firstLiElement[0];
           } else {
@@ -1053,9 +1060,10 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
               nyaBsOption.addClass('selected');
 
             }
-            ngCtrl.$setViewValue(viewValue);
-            $scope.$digest();
           }
+          // update view value regardless
+          ngCtrl.$setViewValue(viewValue);
+          $scope.$digest();
 
           if(!isMultiple) {
             // in single selection mode. close the dropdown menu
@@ -1072,14 +1080,14 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
          * @param nyaBsOption a jqLite wrapped `nya-bs-option` element
          */
         function getOptionValue(nyaBsOption) {
-          var scopeOfOption;
+          var scopeOfOption = nyaBsOption.scope();
           if(valueExpFn) {
-            scopeOfOption = nyaBsOption.scope();
             return valueExpFn(scopeOfOption);
           } else {
-            if(nyaBsSelectCtrl.valueIdentifier || nyaBsSelectCtrl.keyIdentifier) {
-              scopeOfOption = nyaBsOption.scope();
-              return scopeOfOption[nyaBsSelectCtrl.valueIdentifier] || scopeOfOption[nyaBsSelectCtrl.keyIdentifier];
+            if(typeof nyaBsSelectCtrl.valueIdentifier !== 'undefined') {
+              return scopeOfOption[nyaBsSelectCtrl.valueIdentifier];
+            } else if(typeof nyaBsSelectCtrl.keyIdentifier !== 'undefined') {
+              return scopeOfOption[nyaBsSelectCtrl.keyIdentifier];
             } else {
               return nyaBsOption.attr('value');
             }
@@ -1101,7 +1109,12 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
         function updateButtonContent() {
           var modelValue = ngCtrl.$modelValue;
           var filterOption = dropdownToggle.children().eq(0);
-          if(!modelValue) {
+          if(typeof modelValue === 'undefined') {
+            /**
+             * Select empty option when model is undefined.
+             */
+            filterOption.empty();
+            filterOption.append(getDefaultNoneSelectionContent());
             return;
           }
           if(isMultiple && modelValue.length === 0) {

diff --git a/docs/dist/partials/main/getting-started.html b/docs/dist/partials/main/getting-started.html
@@ -14,8 +14,8 @@ <h2 id="installation-">Installation.</h2>
 <pre><code class="lang-html"><span class="hljs-tag">&lt;<span class="hljs-title">link</span> <span class="hljs-attribute">href</span>=<span class="hljs-value">"bower_components/bootstrap/dist/css/bootstrap.css"</span> <span class="hljs-attribute">rel</span>=<span class="hljs-value">"stylesheet"</span>&gt;</span>
 <span class="hljs-tag">&lt;<span class="hljs-title">link</span> <span class="hljs-attribute">href</span>=<span class="hljs-value">"bower_components/nya-bootstrap-select/dist/css/nya-bs-select.css"</span> <span class="hljs-attribute">rel</span>=<span class="hljs-value">"stylesheet"</span>&gt;</span>
 
-<span class="hljs-tag">&lt;<span class="hljs-title">script</span> <span class="hljs-attribute">src</span>=<span class="hljs-value">"bower_components/angular/angular.js"</span>&gt;</span><span class="javascript">
-&lt;script src=<span class="hljs-string">"bower_components/nya-bootstrap-select/dist/js/nya-bs-select.js"</span>&gt;</span><span class="hljs-tag">&lt;/<span class="hljs-title">script</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-title">script</span> <span class="hljs-attribute">src</span>=<span class="hljs-value">"bower_components/angular/angular.js"</span>&gt;</span><span class="javascript"></span><span class="hljs-tag">&lt;/<span class="hljs-title">script</span>&gt;</span>
+<span class="hljs-tag">&lt;<span class="hljs-title">script</span> <span class="hljs-attribute">src</span>=<span class="hljs-value">"bower_components/nya-bootstrap-select/dist/js/nya-bs-select.js"</span>&gt;</span><span class="javascript"></span><span class="hljs-tag">&lt;/<span class="hljs-title">script</span>&gt;</span>
 </code></pre>
 <p>make &#39;nya.bootstrap.select&#39; module as your application dependency.</p>
 <pre><code class="lang-javascript">angular.<span class="hljs-keyword">module</span>(<span class="hljs-symbol">'myApp'</span>, [<span class="hljs-symbol">'nya</span>.bootstrap.select']);