X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.ActionBar.js;h=dc1d35f2cd5911be137478a140b54082f9e05b47;hb=af8f0a39dd0739e1ec5acdeee46bc28cd891de69;hp=c430715a573aba7dc96fecb26420e4d9da4f84e8;hpb=3c13f327bdac0832bcf5d6d2db9585df57c1d285;p=kivitendo-erp.git

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index c430715a5..dc1d35f2c 100644
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -7,6 +7,7 @@ namespace('kivi.ActionBar', function(k){
     disabled: 'layout-actionbar-action-disabled',
     action:   'layout-actionbar-action',
     combobox: 'layout-actionbar-combobox',
+    default:  'layout-actionbar-default-action',
   };
 
   k.Combobox = function(e) {
@@ -55,7 +56,7 @@ namespace('kivi.ActionBar', function(k){
           case 'enter': return 13;
           default:
             if (val.length == 1) {
-              return val.charChodeAt(0);
+              return val.charCodeAt(0);
             } else if (val % 1 === 0) {
               return val;
             } else {
@@ -106,21 +107,23 @@ namespace('kivi.ActionBar', function(k){
     }
   };
 
-  k.removeTooltip = function($e) {
+  k.removeTooltip = function(e) {
+    var $e = $(e);
     if ($e.hasClass('tooltipstered'))
       $e.tooltipster('destroy');
     $e.prop('title', '');
   };
 
-  k.setTooltip = function($e, tooltip) {
+  k.setTooltip = function(e, tooltip) {
+    var $e = $(e);
     if ($e.hasClass('tooltipstered'))
       $e.tooltipster('content', tooltip);
     else
       $e.tooltipster({ content: tooltip, theme: 'tooltipster-light' });
   };
 
-  k.setDisabled = function($e, tooltip) {
-    var data = $e.data('action');
+  k.setDisabled = function(e, tooltip) {
+    var $e = $(e);
 
     $e.addClass(CLASSES.disabled);
 
@@ -130,7 +133,8 @@ namespace('kivi.ActionBar', function(k){
       kivi.ActionBar.removeTooltip($e);
   };
 
-  k.setEnabled = function($e) {
+  k.setEnabled = function(e) {
+    var $e   = $(e);
     var data = $e.data('action');
 
     $e.removeClass(CLASSES.disabled);
@@ -163,7 +167,10 @@ namespace('kivi.ActionBar', function(k){
         kivi.ActionBar.Accesskeys.add_accesskey(data.submit[0], data.accesskey, $e);
       }
       if (data.call) {
-        kivi.ActionBar.Accesskeys.add_accesskey(undefined, data.accesskey, $e);
+        kivi.ActionBar.Accesskeys.add_accesskey('body', data.accesskey, $e);
+      }
+      if (data.accesskey == 'enter') {
+        $e.addClass(CLASSES.default);
       }
     }