X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/339f80aa723d584e29fe42f5307d435d5c6a8cc8..c2aaf253649281fee8e79a3300d81c827d9a1fd1:/js/kivi.ActionBar.js

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index 597b48528..2afedfff7 100644
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -7,24 +7,31 @@ namespace('kivi', function(k){
     disabled: 'layout-actionbar-action-disabled',
     action:   'layout-actionbar-action',
     combobox: 'layout-actionbar-combobox',
-  }
+  };
 
   k.ActionBarCombobox = function(e) {
-    this.combobox = e;
-    this.head     = e.childNodes[0];
-    this.toggle   = this.head.childNodes[1];
-    this.list     = e.childNodes[0];
+    this.combobox  = e;
+    this.head      = e.childNodes[0];
+    this.topAction = this.head.childNodes[0];
+    this.toggle    = this.head.childNodes[1];
+    this.list      = e.childNodes[0];
     this.init();
-  }
+  };
 
   k.ActionBarCombobox.prototype = {
     init: function() {
-      var obj = this;
-      $(obj.toggle).on('click', function(event){
+      var obj     = this;
+      var toggler = function(event){
         $('div.' + CLASSES.combobox + '[id!=' + obj.combobox.id + ']').removeClass(CLASSES.active);
         $(obj.combobox).toggleClass(CLASSES.active);
         event.stopPropagation();
-      });
+      };
+
+      $(obj.toggle).on('click', toggler);
+
+      var data = $(this.topAction).data('action') || {};
+      if (!data.call && !data.submit)
+        $(this.topAction).on('click', toggler);
     }
   };
 
@@ -42,14 +49,13 @@ namespace('kivi', function(k){
       }
 
       var normalized = $.map(String.prototype.split.call(keystring, '+'), function(val, i) {
-        console.log(keystring)
         switch (val) {
           case 'ctrl':
           case 'alt':  return val;
           case 'enter': return 13;
           default:
             if (val.length == 1) {
-              return val.charChodeAt(0)
+              return val.charChodeAt(0);
             } else if (val % 1 === 0) {
               return val;
             } else {
@@ -80,9 +86,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();
@@ -103,6 +112,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) {
@@ -118,7 +129,7 @@ namespace('kivi', function(k){
       $(e).tooltipster({ content: data.tooltip, theme: 'tooltipster-light' });
     }
 
-    if (data.call || data.submit) {
+    if (data.call || data.submit || data.link) {
       $(e).click(function(event) {
         var $hidden, key, func, check;
         if ($(e).hasClass(CLASSES.disabled)) {
@@ -136,22 +147,26 @@ namespace('kivi', function(k){
         if (data.confirm && !confirm(data.confirm)) return;
         if (data.call) {
           func = kivi.get_function_by_name(data.call[0]);
-          func.apply(document, data.call.slice(1))
+          func.apply(document, data.call.slice(1));
         }
         if (data.submit) {
           var form   = data.submit[0];
           var params = data.submit[1];
           for (key in params) {
-            $hidden = $('<input type=hidden>')
-            $hidden.attr('name', key)
-            $hidden.attr('value', params[key])
-            $(form).append($hidden)
+            $('[name=' + key + ']').remove();
+            $hidden = $('<input type=hidden>');
+            $hidden.attr('name', key);
+            $hidden.attr('value', params[key]);
+            $(form).append($hidden);
           }
           $(form).submit();
         }
+        if (data.link) {
+          window.location.href = data.link;
+        }
       });
     }
-  }
+  };
 });
 
 $(function(){