Don't allow keynavlist selection of empty value (Bug #13209)

horde · Jul 1, 2014 · 057ccdc · 057ccdc
1 parent a80aa13
commit 057ccdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/framework/Core/js/keynavlist.js b/framework/Core/js/keynavlist.js
@@ -103,6 +103,9 @@ var KeyNavList = Class.create({
                 v.l = v.l.escapeHTML().gsub('  ', ' &nbsp;');
             }
             li = new Element('LI').insert(v.l).store('v', v.v);
+            if (v.v.empty()) {
+                li.addClassName('noselect');
+            }
             if (v.s) {
                 this.markSelected(li);
             }
@@ -233,6 +236,10 @@ var KeyNavList = Class.create({
 
             if (elt &&
                 (elt == this.div || elt.descendantOf(this.div))) {
+                if (elt.retrieve('v').empty()) {
+                    return;
+                }
+
                 this.markSelected(elt);
                 this.opts.onChoose(this.getCurrentEntry());
                 e.stop();

diff --git a/horde/themes/default/screen.css b/horde/themes/default/screen.css
@@ -1210,6 +1210,9 @@ ul.sound-list {
     color: #000;
     white-space: nowrap;
 }
+.KeyNavList ul li.noselect {
+    color: #888;
+}
 .KeyNavList ul li.selected {
     background: #c2ccd0;
 }