Give the render method the possibility to decide if the text should b…

…e added as a new chip. Also don't clear the text if no chip was added.
mohbasheer · Dec 16, 2016 · d46e754 · d46e754
1 parent 49bb5a8
commit d46e754
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 11 deletions.
diff --git a/dist/angular-chips.js b/dist/angular-chips.js
@@ -102,9 +102,13 @@
                 if (scope.render !== undefined && functionParam !== '') {
                     paramObj = {};
                     paramObj[functionParam] = data;
-                    updatedData = scope.render(paramObj)
+                    updatedData = scope.render(paramObj);
                 } else { updatedData = data }
 
+                if (!updatedData) {
+                  return false;
+                }
+
                 if (isPromiseLike(updatedData)) {
                     updatedData.then(function(response) {
                         model.add(response);
@@ -119,6 +123,8 @@
                     scope.chips.list.push(data);
                     model.add(data);
                 }
+
+                return true;
             };
 
             scope.chips.deleteChip = function(index) {
@@ -412,8 +418,9 @@
     function ChipControlLinkFun(scope, iElement, iAttrs, chipsCtrl) {
         iElement.on('keypress', function(event) {
             if (event.keyCode === 13 && event.target.value !== '') {
-                chipsCtrl.addChip(event.target.value);
-                event.target.value = "";
+                if (chipsCtrl.addChip(event.target.value)) {
+                  event.target.value = "";
+                }
                 event.preventDefault();
             }
         });
@@ -445,8 +452,9 @@
                 ngModelCtrl.$render = function(event) {
                     if (!ngModelCtrl.$modelValue)
                         return;
-                    chipsCtrl.addChip(ngModelCtrl.$modelValue);
-                    iElement.val('');
+                    if (chipsCtrl.addChip(ngModelCtrl.$modelValue)) {
+                      iElement.val('');
+                    }
                 }
 
                 iElement.on('focus', function() {

diff --git a/dist/angular-chips.min.js b/dist/angular-chips.min.js
diff --git a/src/js/directives/chips.js b/src/js/directives/chips.js
@@ -99,9 +99,13 @@
                 if (scope.render !== undefined && functionParam !== '') {
                     paramObj = {};
                     paramObj[functionParam] = data;
-                    updatedData = scope.render(paramObj)
+                    updatedData = scope.render(paramObj);
                 } else { updatedData = data }
 
+                if (!updatedData) {
+                  return false;
+                }
+
                 if (isPromiseLike(updatedData)) {
                     updatedData.then(function(response) {
                         model.add(response);
@@ -116,6 +120,8 @@
                     scope.chips.list.push(data);
                     model.add(data);
                 }
+
+                return true;
             };
 
             scope.chips.deleteChip = function(index) {

diff --git a/src/js/directives/controls/chip_control.js b/src/js/directives/controls/chip_control.js
@@ -17,8 +17,9 @@
     function ChipControlLinkFun(scope, iElement, iAttrs, chipsCtrl) {
         iElement.on('keypress', function(event) {
             if (event.keyCode === 13 && event.target.value !== '') {
-                chipsCtrl.addChip(event.target.value);
-                event.target.value = "";
+                if (chipsCtrl.addChip(event.target.value)) {
+                  event.target.value = "";
+                }
                 event.preventDefault();
             }
         });

diff --git a/src/js/directives/controls/ng_model_control.js b/src/js/directives/controls/ng_model_control.js
@@ -16,8 +16,9 @@
                 ngModelCtrl.$render = function(event) {
                     if (!ngModelCtrl.$modelValue)
                         return;
-                    chipsCtrl.addChip(ngModelCtrl.$modelValue);
-                    iElement.val('');
+                    if (chipsCtrl.addChip(ngModelCtrl.$modelValue)) {
+                      iElement.val('');
+                    }
                 }
 
                 iElement.on('focus', function() {