Bug: 13256 If knl is open, only process the selected node.

horde · Jun 11, 2014 · c30ef30 · c30ef30
1 parent 5cf474a
commit c30ef30
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/framework/Core/js/prettyautocomplete.js b/framework/Core/js/prettyautocomplete.js
@@ -9,6 +9,8 @@
 
 var PrettyAutocompleter = Class.create({
 
+    aac: null,
+
     initialize: function(element, params)
     {
         this.p = Object.extend({
@@ -87,7 +89,7 @@ var PrettyAutocompleter = Class.create({
 
         // Make sure the knl is contained in the overlay
         this.p.domParent = this.p.box;
-        new Ajax.Autocompleter(this.p.trigger, this.p.uri, this.p);
+        this.aac = new Ajax.Autocompleter(this.p.trigger, this.p.uri, this.p);
 
         this.initialized = true;
 
@@ -165,14 +167,20 @@ var PrettyAutocompleter = Class.create({
     _onKeyDown: function(e)
     {
         // Check for a comma or enter
-        if ((e.keyCode == 188 || e.keyCode == Event.KEY_RETURN) && !this.p.requireSelection) {
+        if ((e.keyCode == 188 || (this._honorReturn() && e.keyCode == Event.KEY_RETURN)) && !this.p.requireSelection) {
             this._processValue();
             e.stop();
         } else if (e.keyCode == 188) {
             e.stop();
         }
     },
 
+    _honorReturn: function()
+    {
+        return (this.aac.knl && !this.aac.knl.getCurrentEntry()) ||
+               !this.aac.knl;
+    },
+
     _processValue: function()
     {
         var value = $F(this.p.trigger).replace(/^,/, '').strip();