From 8795206ebe1810c6fa38fbe7164aaa65aba14b7e Mon Sep 17 00:00:00 2001
From: Koen Reefman <koen.reefman@aareon.nl>
Date: Wed, 16 Nov 2016 13:33:49 +0000
Subject: [PATCH] svn path=/Website/trunk/; revision=31506

---
 APPL/Localscripts/resultset_table_v2.js | 35 ++++++++++++++++---------
 APPL/Shared/iface.inc                   |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/APPL/Localscripts/resultset_table_v2.js b/APPL/Localscripts/resultset_table_v2.js
index 17dfc4daf4..737d1fad44 100644
--- a/APPL/Localscripts/resultset_table_v2.js
+++ b/APPL/Localscripts/resultset_table_v2.js
@@ -169,6 +169,7 @@ function initActions(tableID, hambType)
             else
             {
                 $(document).add(parent.document).add(parent.parent.document).click(defaultHamburgerAction);
+                $(document).ready(willHide);
                 $("#" + tableID)
                             .on('click', 'tr', defaultHamburgerAction)
                             .on('mouseover', 'tr', hambSetCursor);
@@ -190,18 +191,6 @@ function initActions(tableID, hambType)
     });
 }
 
-function defaultHamburgerAction(event)
-{
-    var thisTR = $(this).closest('tr')[0];
-
-    if (!$('li.byHamburger').hasClass('hidden'))
-        $('li.byHamburger').toggleClass('hidden');
-    else if ($currentActionsDiv().css('display') != "none")
-        hideActions.apply(thisTR, [event]);
-    else if (!!$(event.currentTarget).attr("ROWKEY"))
-        defaultAction.apply(thisTR, [event]);
-}
-
 function $currentActionsDiv()
 {
     var tbl = $(window.activerow).closest("table.rstable");
@@ -211,6 +200,28 @@ function $currentActionsDiv()
     return $("#allactions_" + tbl[0].id +".allactions");
 }
 
+function willHide()
+{
+    $("li#printhamburger").each(function() {
+        var attribute = $(this).attr('fcltclick');
+        if (attribute)
+            $(this).attr('fcltclick', attribute + "hideActions();");
+    });
+}
+
+function defaultHamburgerAction(event)
+{
+    var thisTR = $(this).closest('tr')[0];
+
+    if ($('li.byHamburger').length > 0 && !($('li.byHamburger').hasClass('hidden')))
+        $('li.byHamburger').toggleClass('hidden');
+
+    hideActions.apply(thisTR, [event]);
+
+    if (!!$(event.currentTarget).attr("ROWKEY"))
+        defaultAction.apply(thisTR, [event]);
+}
+
 function defaultAction(event)
 {
     var key = this.getAttribute("ROWKEY");
diff --git a/APPL/Shared/iface.inc b/APPL/Shared/iface.inc
index 113f64327c..667e15d4c2 100644
--- a/APPL/Shared/iface.inc
+++ b/APPL/Shared/iface.inc
@@ -95,7 +95,7 @@ function CreateButtons(buttons, params)
       if (hamburger && !params.isDialog)
       {
         var btn = { icon: "fa-bars", tooltip: L("lcl_more"), id: "printhamburger",
-                    action: "$('li.byHamburger').toggleClass('hidden');FcltMgr.resized();hideActions();" }
+                    action: "$('li.byHamburger').toggleClass('hidden');FcltMgr.resized();" }
         CreateButton(null, btn.action, btn, params );
       }
  %>