ActionBar.js: Enter auf Comboboxes von Combobox bearbeiten lassen

[mfinanz.git] / js / kivi.ActionBar.js

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index 5bffa3c5ffda251be551cc430d760975209d9b13..adc3eb380cc87f22ece42a1e7aa5648a4de5b377 100644 (file)
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -41,7 +41,8 @@ namespace('kivi', function(k){
         target = 'document';
       }
 
-      var normalized = $.map(keystring.split('+'), function(val, i) {
+      var normalized = $.map(String.prototype.split.call(keystring, '+'), function(val, i) {
+        console.log(keystring)
         switch (val) {
           case 'ctrl':
           case 'alt':  return val;
@@ -49,18 +50,14 @@ namespace('kivi', function(k){
           default:
             if (val.length == 1) {
               return val.charChodeAt(0)
-            } else if (typeof val === 'number') {
-              return val
             } else if (val % 1 === 0) {
-              return val % 1;
+              return val;
             } else {
               console.log('can not normalize access key token: ' + val);
             }
         }
       }).join('+');
 
-      console.log(normalized)
-
       if (!(target in this.actions))
         this.actions[target] = {};
       this.actions[target][normalized] = action;
@@ -83,9 +80,12 @@ namespace('kivi', function(k){
       accesskey += e.which;
 
       // special case. HTML elements that make legitimate use of enter will also trigger the enter accesskey.
-      // so. if accesskey is '13' and the event source is one of these (currently only textarea) ignore it.
+      // so. if accesskey is '13' and the event source is one of these (currently only textareas & combo boxes) ignore it.
       // higher level widgets will usually prevent their key events from bubbling if used.
-      if (accesskey == 13 && e.target.tagName == 'TEXTAREA') return true;
+      if (   (accesskey == 13)
+          && (   (e.target.tagName == 'TEXTAREA')
+              || (e.target.tagName == 'SELECT')))
+        return true;
 
       if ((target in k.ActionBarAccesskeys.actions) && (accesskey in k.ActionBarAccesskeys.actions[target])) {
         e.stopPropagation();
@@ -106,6 +106,8 @@ namespace('kivi', function(k){
 
     if (data.disabled) {
       $(e).addClass(CLASSES.disabled);
+      if (!data.tooltip && (data.disabled != '1'))
+        data.tooltip = data.disabled;
     }
 
     if (data.accesskey) {