fix prompt bug

tamtakoe · Oct 13, 2015 · cfac8dd · cfac8dd
1 parent ea2b5d0
commit cfac8dd
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,11 @@
 ## 0.2.13
+
+#### Bug Fixes
+
+- **oi-select-options:**
+    - newItem = "prompt": fixed items saving
+
+## 0.2.13
 
 #### Features
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 #oi.select — AngularJS directive of select element
 
-**[Download 0.2.13](https://github.com/tamtakoe/oi.select/tree/master/dist)**
+**[Download 0.2.14](https://github.com/tamtakoe/oi.select/tree/master/dist)**
 
 ## Features
 

diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
         "name": "https://github.com/tamtakoe"
     },
     "name": "oi.select",
-    "version": "0.2.13",
+    "version": "0.2.14",
     "main": ["./dist/select-tpls.min.js", "./dist/select.min.css"],
     "dependencies": {
         "angular": ">=1.2",

diff --git a/dist/select-tpls.js b/dist/select-tpls.js
@@ -14,10 +14,10 @@ angular.module('oi.select')
             saveTrigger:    'enter'
         },
         version: {
-            full: '0.2.13',
+            full: '0.2.14',
             major: 0,
             minor: 2,
-            dot: 13
+            dot: 14
         },
         $get: function() {
             return {
@@ -473,15 +473,21 @@ angular.module('oi.select')
                     }
                 });
 
+                function valueChangedManually() { //case: clean model; prompt + editItem: 'correct'; initial value = defined/undefined
+                    if (editItemIsCorrected) {
+                        element.removeClass('cleanMode');
+                    }
+                    editItemIsCorrected = false;
+                }
+
                 scope.$parent.$watch(attrs.ngModel, function(value, oldValue) {
                     var output = value instanceof Array ? value : value ? [value]: [],
                         promise = $q.when(output);
 
                     modifyPlaceholder();
 
-                    if (value !== oldValue) {
-                        editItemIsCorrected = false;
-                        element.removeClass('cleanMode');
+                    if (oldValue && value !== oldValue) {
+                        valueChangedManually();
                     }
 
                     if (!multiple) {
@@ -587,6 +593,8 @@ angular.module('oi.select')
                         resetMatches({query: true});
                     }
 
+                    valueChangedManually();
+
                     scope.oldQuery = scope.oldQuery || scope.query;
                     scope.query = '';
                     scope.backspaceFocus = false;
@@ -913,7 +921,7 @@ angular.module('oi.select')
                             .finally(function(){
                                 scope.showLoader = false;
 
-                                if (options.closeList) {
+                                if (options.closeList && !options.cleanModel) { //case: prompt
                                     $timeout(function() {
                                         setOption(listElement, 0);
                                     });

diff --git a/dist/select-tpls.min.js b/dist/select-tpls.min.js
diff --git a/dist/select.js b/dist/select.js
@@ -14,10 +14,10 @@ angular.module('oi.select')
             saveTrigger:    'enter'
         },
         version: {
-            full: '0.2.13',
+            full: '0.2.14',
             major: 0,
             minor: 2,
-            dot: 13
+            dot: 14
         },
         $get: function() {
             return {
@@ -473,15 +473,21 @@ angular.module('oi.select')
                     }
                 });
 
+                function valueChangedManually() { //case: clean model; prompt + editItem: 'correct'; initial value = defined/undefined
+                    if (editItemIsCorrected) {
+                        element.removeClass('cleanMode');
+                    }
+                    editItemIsCorrected = false;
+                }
+
                 scope.$parent.$watch(attrs.ngModel, function(value, oldValue) {
                     var output = value instanceof Array ? value : value ? [value]: [],
                         promise = $q.when(output);
 
                     modifyPlaceholder();
 
-                    if (value !== oldValue) {
-                        editItemIsCorrected = false;
-                        element.removeClass('cleanMode');
+                    if (oldValue && value !== oldValue) {
+                        valueChangedManually();
                     }
 
                     if (!multiple) {
@@ -587,6 +593,8 @@ angular.module('oi.select')
                         resetMatches({query: true});
                     }
 
+                    valueChangedManually();
+
                     scope.oldQuery = scope.oldQuery || scope.query;
                     scope.query = '';
                     scope.backspaceFocus = false;
@@ -913,7 +921,7 @@ angular.module('oi.select')
                             .finally(function(){
                                 scope.showLoader = false;
 
-                                if (options.closeList) {
+                                if (options.closeList && !options.cleanModel) { //case: prompt
                                     $timeout(function() {
                                         setOption(listElement, 0);
                                     });

diff --git a/dist/select.min.js b/dist/select.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name":    "oi.select",
     "license": "MIT",
-    "version": "0.2.13",
+    "version": "0.2.14",
     "repository": {
         "type": "git",
         "url": "git://github.com/tamtakoe/oi.select.git"

diff --git a/src/directives.js b/src/directives.js
@@ -137,15 +137,21 @@ angular.module('oi.select')
                     }
                 });
 
+                function valueChangedManually() { //case: clean model; prompt + editItem: 'correct'; initial value = defined/undefined
+                    if (editItemIsCorrected) {
+                        element.removeClass('cleanMode');
+                    }
+                    editItemIsCorrected = false;
+                }
+
                 scope.$parent.$watch(attrs.ngModel, function(value, oldValue) {
                     var output = value instanceof Array ? value : value ? [value]: [],
                         promise = $q.when(output);
 
                     modifyPlaceholder();
 
-                    if (value !== oldValue) {
-                        editItemIsCorrected = false;
-                        element.removeClass('cleanMode');
+                    if (oldValue && value !== oldValue) {
+                        valueChangedManually();
                     }
 
                     if (!multiple) {
@@ -251,6 +257,8 @@ angular.module('oi.select')
                         resetMatches({query: true});
                     }
 
+                    valueChangedManually();
+
                     scope.oldQuery = scope.oldQuery || scope.query;
                     scope.query = '';
                     scope.backspaceFocus = false;
@@ -577,7 +585,7 @@ angular.module('oi.select')
                             .finally(function(){
                                 scope.showLoader = false;
 
-                                if (options.closeList) {
+                                if (options.closeList && !options.cleanModel) { //case: prompt
                                     $timeout(function() {
                                         setOption(listElement, 0);
                                     });

diff --git a/src/services.js b/src/services.js
@@ -13,10 +13,10 @@ angular.module('oi.select')
             saveTrigger:    'enter'
         },
         version: {
-            full: '0.2.13',
+            full: '0.2.14',
             major: 0,
             minor: 2,
-            dot: 13
+            dot: 14
         },
         $get: function() {
             return {