Merge pull request #44 from jca258/master

Call event handlers when needed
lordfriend · Mar 5, 2015 · 35958dd · 35958dd
2 parents e422ae5 + fbc705c
commit 35958dd
Show file tree

Hide file tree

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

diff --git a/dist/js/nya-bs-select.js b/dist/js/nya-bs-select.js
@@ -664,10 +664,19 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
         // if click the outside of dropdown menu, close the dropdown menu
         $document.on('click', function(event) {
           if(filterTarget(event.target, $element.parent()[0], $element[0]) === null) {
+            if($element.hasClass('open')) {
+              $element.triggerHandler('blur');
+            }
             $element.removeClass('open');
           }
         });
 
+
+        dropdownToggle.on('blur', function() {
+          if(!$element.hasClass('open')) {
+            $element.triggerHandler('blur');
+          }
+        });
         dropdownToggle.on('click', function() {
           var nyaBsOptionNode;
           $element.toggleClass('open');
@@ -853,6 +862,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
             if(keyCode === 27) {
               // escape pressed
               dropdownToggle[0].focus();
+              if($element.hasClass('open')) {
+                $element.triggerHandler('blur');
+              }
               $element.removeClass('open');
               event.stopPropagation();
 
@@ -1067,6 +1079,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
 
           if(!isMultiple) {
             // in single selection mode. close the dropdown menu
+            if($element.hasClass('open')) {
+              $element.triggerHandler('blur');
+            }
             $element.removeClass('open');
           }
           updateButtonContent();
@@ -1108,6 +1123,8 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
 
         function updateButtonContent() {
           var modelValue = ngCtrl.$modelValue;
+          $element.triggerHandler('change');
+
           var filterOption = dropdownToggle.children().eq(0);
           if(typeof modelValue === 'undefined') {
             /**

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.9",
+  "version": "2.0.10",
   "description": "An angular directive wraps bootstrap-select",
   "repository": {
     "type": "git",

diff --git a/src/nya-bs-select.js b/src/nya-bs-select.js
@@ -261,10 +261,19 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
         // if click the outside of dropdown menu, close the dropdown menu
         $document.on('click', function(event) {
           if(filterTarget(event.target, $element.parent()[0], $element[0]) === null) {
+            if($element.hasClass('open')) {
+              $element.triggerHandler('blur');
+            }
             $element.removeClass('open');
           }
         });
         console.log(dropdownToggle[0]==$element.find('button').eq(0)[0]);
+
+        dropdownToggle.on('blur', function() {
+          if(!$element.hasClass('open')) {
+            $element.triggerHandler('blur');
+          }
+        });
         dropdownToggle.on('click', function() {
           var nyaBsOptionNode;
           $element.toggleClass('open');
@@ -450,6 +459,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
             if(keyCode === 27) {
               // escape pressed
               dropdownToggle[0].focus();
+              if($element.hasClass('open')) {
+                $element.triggerHandler('blur');
+              }
               $element.removeClass('open');
               event.stopPropagation();
 
@@ -664,6 +676,9 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
 
           if(!isMultiple) {
             // in single selection mode. close the dropdown menu
+            if($element.hasClass('open')) {
+              $element.triggerHandler('blur');
+            }
             $element.removeClass('open');
           }
           updateButtonContent();
@@ -705,6 +720,8 @@ nyaBsSelect.directive('nyaBsSelect', ['$parse', '$document', '$timeout', 'nyaBsC
 
         function updateButtonContent() {
           var modelValue = ngCtrl.$modelValue;
+          $element.triggerHandler('change');
+
           var filterOption = dropdownToggle.children().eq(0);
           if(typeof modelValue === 'undefined') {
             /**