ActionBar: »checks«-Funktionen auch mit Argumenten aufrufen können

[kivitendo-erp.git] / js / kivi.ActionBar.js

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index 0963d73..9f48d2e 100644 (file)
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -10,21 +10,28 @@ namespace('kivi', function(k){
   };
 
   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);
     }
   };
 
@@ -48,7 +55,7 @@ namespace('kivi', function(k){
           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 {
@@ -122,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)) {
@@ -132,27 +139,35 @@ namespace('kivi', function(k){
         if (data.checks) {
           for (var i=0; i < data.checks.length; i++) {
             check = data.checks[i];
-            func = kivi.get_function_by_name(check);
-            if (!func) console.log('Cannot find check function: ' + check);
-            if (!func()) return;
+            if (check.constructor !== Array)
+              check = [ check ];
+            func = kivi.get_function_by_name(check[0]);
+            if (!func)
+              console.log('Cannot find check function: ' + check);
+            if (!func.apply(document, check.slice(1)))
+              return;
           }
         }
         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;
+        }
       });
     }
   };