From e061159229299a788ba82ef3f0b087fba0a04c14 Mon Sep 17 00:00:00 2001 From: Koen Reefman Date: Thu, 27 Oct 2016 13:23:02 +0000 Subject: [PATCH] FSN#38071 hamburger -> verticale inline actions ipv horizontaal svn path=/Website/trunk/; revision=31267 --- APPL/Localscripts/resultset_table_v2.js | 2 +- APPL/Shared/resultset_table_v2.inc | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/APPL/Localscripts/resultset_table_v2.js b/APPL/Localscripts/resultset_table_v2.js index bc4d6df3f3..205611c359 100644 --- a/APPL/Localscripts/resultset_table_v2.js +++ b/APPL/Localscripts/resultset_table_v2.js @@ -252,7 +252,7 @@ function showActions(event) // event op de mouseover van resultsettable } }); - $actiondiv.css('top', $(this).offset().top + $(this).outerHeight() - $actiondiv.outerHeight() - 5 + "px"); + $actiondiv.css('top', $(this).offset().top + $(this).outerHeight() - $actiondiv.outerHeight() - (touch?10:5) + "px"); if (!anyShow) { $actiondiv.hide(); diff --git a/APPL/Shared/resultset_table_v2.inc b/APPL/Shared/resultset_table_v2.inc index 94a1c7c85b..543d095f94 100644 --- a/APPL/Shared/resultset_table_v2.inc +++ b/APPL/Shared/resultset_table_v2.inc @@ -219,11 +219,12 @@ ResultsetTable.prototype.addAction = __rsAddAction; function __rsAddAction(params) { - /* + /* Nu ook inline actions bij PDA (hamburger) + if (device.test(device.isTouch) && !params.isDefault) { params.single = false; // touch heeft geen mouseover. Dan alleen de default onclick } - Nu ook actions bij PDA (hamburger) + */ this.actions.push(params); @@ -699,14 +700,16 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al var def = (this.actions[i].isDefault? " isdefault='1'" : "") + (this.actions[i].onlyMulti? " onlymulti='1'" : "") + (this.actions[i].isDefault || this.actions[i].onlyMulti? " style='display:none'" : ""); + var disp = device.test(device.isTouch) ? " style='display: block;'" : ""; if (this.actions[i].multiOnce) - val = "\n"; + val = "\n"; else - val = "\n"; + val = "\n"; actionsDiv += val + this.actions[i].caption + ""; } hasInlineActions = aantalInline > 0; if (hasInlineActions) hasActionsCol++; + if (device.test(device.isTouch)) hasActionsCol = anyMultiActions ? 2 : 1; html += "\n"; html += "\n