fix IE bug

tamtakoe · Sep 4, 2015 · 0dfef25 · 0dfef25
1 parent ec3fd50
commit 0dfef25
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,10 +3,10 @@
 #### Features
 
 - **oi-select-options:**
-    - cleanModel: changed behavior (clean model by click)
+    - cleanModel: changed behavior (clean model by click). It affected `newItem: 'prompt'`
 
 #### Bug Fixes
-
+- **dropdown** fixed dropdown opening in IE, open dropdown by pushing on letter keys (for single select)
 - **oi-select-options:**
     - closeList: fixed
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 #oi.select — AngularJS directive of select element
 
-**[Download 0.2.11](https://github.com/tamtakoe/oi.select/tree/master/dist)**
+**[Download 0.2.12](https://github.com/tamtakoe/oi.select/tree/master/dist)**
 
 ## Features
 
@@ -91,7 +91,7 @@ Use `oi-select` directive:
   * `listFilter` — filter name for items order in dropdown. Use `none` to disable filtering
   * `editItem` — function which get `lastQuery`, `removedItem` and `getLabel(item)` and return string for input after element was removed (default: ''). `editItem = true` allows you to edit a deleted item. `editItem = 'correct'` same as `true` but does not edit the first time
   * `saveTrigger` — Trigger on which element is stored in the model. May be `enter`, `blur` (default: `enter`)
-  * `cleanModel` [deprecated] — Clean model on blur for single select.
+  * `cleanModel` — Clean model on click for single select.
   * `closeList` — close dropdown list by default after choosing or removing item (default: true)
   * `newItem` — Mode of adding new items from query (default: false). May be `autocomplete` (priority save matches), `prompt` (priority save new item)
   * `newItemModel` — New items model (default: model = query). `$query` value from model will be changed to query string.

diff --git a/dist/select-tpls.js b/dist/select-tpls.js
@@ -80,7 +80,9 @@ angular.module('oi.select')
         element[0].addEventListener('blur', blurHandler, true);
         inputElement.on('focus', focusHandler);
 
-        function blurHandler() {
+        function blurHandler(event) {
+            if (event.target.nodeName !== 'INPUT') return; //for IE
+
             isBlur = false;
 
             if (isMousedown) {
@@ -414,7 +416,7 @@ angular.module('oi.select')
                     };
                 }
 
-                if (options.cleanModel) {
+                if (options.cleanModel && (!editItem || editItemCorrect)) {
                     element.addClass('cleanMode');
                 }
 
@@ -584,7 +586,10 @@ angular.module('oi.select')
                         scope.query = editItemFn(removedItem, lastQuery, getLabel);
                     }
 
-                    editItemCorrect = false;
+                    if (editItem) {
+                        editItemCorrect = false;
+                        element.removeClass('cleanMode');
+                    }
 
                     if (multiple && options.closeList) {
                         resetMatches({query: true});
@@ -669,6 +674,9 @@ angular.module('oi.select')
                                 break;
                             }
                         default: /* any key */
+                            if (scope.inputHide) {
+                                cleanInput();
+                            }
                             scope.backspaceFocus = false;
                             return false; //preventDefaults
                     }

diff --git a/dist/select-tpls.min.js b/dist/select-tpls.min.js
diff --git a/dist/select.js b/dist/select.js
@@ -80,7 +80,9 @@ angular.module('oi.select')
         element[0].addEventListener('blur', blurHandler, true);
         inputElement.on('focus', focusHandler);
 
-        function blurHandler() {
+        function blurHandler(event) {
+            if (event.target.nodeName !== 'INPUT') return; //for IE
+
             isBlur = false;
 
             if (isMousedown) {
@@ -414,7 +416,7 @@ angular.module('oi.select')
                     };
                 }
 
-                if (options.cleanModel) {
+                if (options.cleanModel && (!editItem || editItemCorrect)) {
                     element.addClass('cleanMode');
                 }
 
@@ -584,7 +586,10 @@ angular.module('oi.select')
                         scope.query = editItemFn(removedItem, lastQuery, getLabel);
                     }
 
-                    editItemCorrect = false;
+                    if (editItem) {
+                        editItemCorrect = false;
+                        element.removeClass('cleanMode');
+                    }
 
                     if (multiple && options.closeList) {
                         resetMatches({query: true});
@@ -669,6 +674,9 @@ angular.module('oi.select')
                                 break;
                             }
                         default: /* any key */
+                            if (scope.inputHide) {
+                                cleanInput();
+                            }
                             scope.backspaceFocus = false;
                             return false; //preventDefaults
                     }

diff --git a/dist/select.min.js b/dist/select.min.js
diff --git a/docs/examples/autocomplete/controller.js b/docs/examples/autocomplete/controller.js
@@ -4,6 +4,6 @@ angular.module('selectDemo')
         $scope.shopObj = ShopObj.get();
 
         $scope.shopObj.$promise.then(function(data) {
-            $scope.bundle = [data[5]];
+            $scope.bundle = data[5];
         });
     });
diff --git a/docs/examples/autocomplete/template.html b/docs/examples/autocomplete/template.html
@@ -6,7 +6,6 @@ <h2>Autocomplete</h2>
             <oi-select
                 oi-options="item.name for (key, item) in shopObj"
                 ng-model="bundle"
-                multiple
                 oi-select-options="{
                     newItem: 'autocomplete',
                     newItemModel: {id: null, name: $query, category: 'shoes'},
@@ -21,7 +20,6 @@ <h2>Autocomplete</h2>
 <div hljs class="col-md-8">
 oi-options="item.name for (key, item) in shopObj"
 ng-model="bundle"
-multiple
 oi-select-options="{
     newItem: 'autocomplete',
     newItemModel: {id: null, name: $query, category: 'shoes'},

diff --git a/docs/examples/prompt/controller.js b/docs/examples/prompt/controller.js
@@ -4,6 +4,6 @@ angular.module('selectDemo')
         $scope.shopObj = ShopObj.get();
 
         $scope.shopObj.$promise.then(function(data) {
-            $scope.bundle = [data[5]];
+            $scope.bundle = data[5];
         });
     });
diff --git a/docs/examples/prompt/template.html b/docs/examples/prompt/template.html
@@ -6,7 +6,6 @@ <h2>Prompt</h2>
             <oi-select
                 oi-options="item.name for (key, item) in shopObj"
                 ng-model="bundle"
-                multiple
                 oi-select-options="{
                     newItem: 'prompt',
                     newItemModel: {id: null, name: $query, category: 'shoes'},
@@ -20,7 +19,6 @@ <h2>Prompt</h2>
 <div hljs class="col-md-8">
 oi-options="item.name for (key, item) in shopObj"
 ng-model="bundle"
-multiple
 oi-select-options="{
     newItem: 'prompt',
     newItemModel: {id: null, name: $query, category: 'shoes'},

diff --git a/src/directives.js b/src/directives.js
@@ -80,7 +80,7 @@ angular.module('oi.select')
                     };
                 }
 
-                if (options.cleanModel) {
+                if (options.cleanModel && (!editItem || editItemCorrect)) {
                     element.addClass('cleanMode');
                 }
 
@@ -250,7 +250,10 @@ angular.module('oi.select')
                         scope.query = editItemFn(removedItem, lastQuery, getLabel);
                     }
 
-                    editItemCorrect = false;
+                    if (editItem) {
+                        editItemCorrect = false;
+                        element.removeClass('cleanMode');
+                    }
 
                     if (multiple && options.closeList) {
                         resetMatches({query: true});
@@ -335,6 +338,9 @@ angular.module('oi.select')
                                 break;
                             }
                         default: /* any key */
+                            if (scope.inputHide) {
+                                cleanInput();
+                            }
                             scope.backspaceFocus = false;
                             return false; //preventDefaults
                     }

diff --git a/src/services.js b/src/services.js
@@ -79,7 +79,9 @@ angular.module('oi.select')
         element[0].addEventListener('blur', blurHandler, true);
         inputElement.on('focus', focusHandler);
 
-        function blurHandler() {
+        function blurHandler(event) {
+            if (event.target.nodeName !== 'INPUT') return; //for IE
+
             isBlur = false;
 
             if (isMousedown) {