From 80f2a2f4bd66023134725c75b196492bde46a170 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sven=20Sch=C3=B6ling?= <s.schoeling@linet-services.de>
Date: Thu, 13 Oct 2016 14:07:20 +0200
Subject: [PATCH] ActionBar: check confirm after checks
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

So muss im Falle dass checks meckern nicht doppelt bestätigt werden
---
 js/kivi.ActionBar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/kivi.ActionBar.js b/js/kivi.ActionBar.js
index 6e7cc165b..44f0d6efe 100644
--- a/js/kivi.ActionBar.js
+++ b/js/kivi.ActionBar.js
@@ -13,7 +13,6 @@ namespace('kivi', function(k){
        $(e).click(function(event) {
          var $hidden, key, func, check;
          if (data.disabled) return;
-         if (data.confirm && !confirm(data.confirm)) return;
          if (data.checks) {
            for (var i=0; i < data.checks.length; i++) {
              check = data.checks[i];
@@ -22,6 +21,7 @@ namespace('kivi', function(k){
              if (!func()) return;
            }
          }
+         if (data.confirm && !confirm(data.confirm)) return;
          for (key in params) {
            $hidden = $('<input type=hidden>')
            $hidden.attr('name', key)
@@ -35,7 +35,6 @@ namespace('kivi', function(k){
        $(e).click(function(event) {
          var func;
          if (data.disabled) return;
-         if (data.confirm && !confirm(data.confirm)) return;
          if (data.checks) {
            for (var i=0; i < data.checks.length; i++) {
              check = data.checks[i];
@@ -44,6 +43,7 @@ namespace('kivi', function(k){
              if (!func()) return;
            }
          }
+         if (data.confirm && !confirm(data.confirm)) return;
          func = kivi.get_function_by_name(data.function[0]);
          func.apply(document, data.function.slice(1))
        });
-- 
2.20.1