Bug 1183759 : Keyword suggestions should not show keywords which have been already...

diff --git a/extensions/BugModal/web/bug_modal.js b/extensions/BugModal/web/bug_modal.js
index 107b6af007fbebc00678e263813ea469004eb058..b3fc875f45558659de47d6dfc714d325bcbe0261 100644 (file)
--- a/extensions/BugModal/web/bug_modal.js
+++ b/extensions/BugModal/web/bug_modal.js
@@ -638,14 +638,19 @@ $(function() {
                         forceFixPosition: true,
                         lookup: function(query, done) {
                             query = query.toLowerCase();
+                            let that = document.querySelector('#keywords');
+                            var activeValues = that.value.split(',');
+                            activeValues.forEach((o,i,a) => a[i] = a[i].trim());
                             var matchStart =
                                 $.grep(keywords, function(keyword) {
-                                    return keyword.toLowerCase().substr(0, query.length) === query;
+                                    if(!(activeValues.includes(keyword)))
+                                        return keyword.toLowerCase().substr(0, query.length) === query;
                                 });
                             var matchSub =
                                 $.grep(keywords, function(keyword) {
-                                    return keyword.toLowerCase().indexOf(query) !== -1 &&
-                                        $.inArray(keyword, matchStart) === -1;
+                                    if(!(activeValues.includes(keyword)))
+                                        return keyword.toLowerCase().indexOf(query) !== -1 &&
+                                            $.inArray(keyword, matchStart) === -1;
                                 });
                             var suggestions =
                                 $.map($.merge(matchStart, matchSub), function(suggestion) {

diff --git a/js/field.js b/js/field.js
index ae0393f59276267e1bbc52798e673708aecb24d2..ca0c86ae3e1ea85408bde78dec499bc72fe006b2 100644 (file)
--- a/js/field.js
+++ b/js/field.js
@@ -716,14 +716,18 @@ $(function() {
                 lookup: function(query, done) {
                     var values = BUGZILLA.autocomplete_values[that.data('values')];
                     query = query.toLowerCase();
+                    var activeValues = document.querySelector('#keywords').value.split(',');
+                    activeValues.forEach((o,i,a) => a[i] = a[i].trim());
                     var matchStart =
                         $.grep(values, function(value) {
-                            return value.toLowerCase().substr(0, query.length) === query;
+                            if(!(activeValues.includes(value)))
+                                return value.toLowerCase().substr(0, query.length) === query;
                         });
                     var matchSub =
                         $.grep(values, function(value) {
-                            return value.toLowerCase().indexOf(query) !== -1 &&
-                                $.inArray(value, matchStart) === -1;
+                            if(!(activeValues.includes(value)))
+                                return value.toLowerCase().indexOf(query) !== -1 &&
+                                    $.inArray(value, matchStart) === -1;
                         });
                     var suggestions =
                         $.map($.merge(matchStart, matchSub), function(suggestion) {