admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#38071 hamburger -> verticale inline actions ipv horizontaal

Browse Source 
svn path=/Website/trunk/; revision=31267
This commit is contained in:
Koen Reefman
2016-10-27 13:23:02 +00:00
parent eaa1aef38d
commit e061159229
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/Localscripts/resultset_table_v2.js
View File

@@ -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) if (!anyShow)
{ {
$actiondiv.hide(); $actiondiv.hide();

11
APPL/Shared/resultset_table_v2.inc
View File

@@ -219,11 +219,12 @@ ResultsetTable.prototype.addAction = __rsAddAction;
function __rsAddAction(params) function __rsAddAction(params)
{ {
/* /* Nu ook inline actions bij PDA (hamburger)
if (device.test(device.isTouch) && !params.isDefault) { if (device.test(device.isTouch) && !params.isDefault) {
params.single = false; // touch heeft geen mouseover. Dan alleen de default onclick params.single = false; // touch heeft geen mouseover. Dan alleen de default onclick
} }
Nu ook actions bij PDA (hamburger)
*/ */
this.actions.push(params); this.actions.push(params);
@@ -699,14 +700,16 @@ function __rsProcessResultset(processParams) // processParams wordt blind aan al
var def = (this.actions[i].isDefault? " isdefault='1'" : "") var def = (this.actions[i].isDefault? " isdefault='1'" : "")
+ (this.actions[i].onlyMulti? " onlymulti='1'" : "") + (this.actions[i].onlyMulti? " onlymulti='1'" : "")
+ (this.actions[i].isDefault || this.actions[i].onlyMulti? " style='display:none'" : ""); + (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) if (this.actions[i].multiOnce)
val = "\n<span class='ia2' " + def + " onclick='doAm(event, this, \"" + this.actions[i].action + "\")'>"; val = "\n<span class='ia2' " + def + " onclick='doAm(event, this, \"" + this.actions[i].action + "\")'" + disp + ">";
else else
val = "\n<span class='ia2' " + def + " onclick='doA(event, this, \"" + this.actions[i].action + "\")'>"; val = "\n<span class='ia2' " + def + " onclick='doA(event, this, \"" + this.actions[i].action + "\")'" + disp + ">";
actionsDiv += val + this.actions[i].caption + "</span>"; actionsDiv += val + this.actions[i].caption + "</span>";
} }
hasInlineActions = aantalInline > 0; hasInlineActions = aantalInline > 0;
if (hasInlineActions) hasActionsCol++; if (hasInlineActions) hasActionsCol++;
if (device.test(device.isTouch)) hasActionsCol = anyMultiActions ? 2 : 1;
html += "\n<div id='allactions_" + ID + "' class='allactions' style='display:none' hasActionsCol='"+hasActionsCol+"' >" + actionsDiv + "</div>"; html += "\n<div id='allactions_" + ID + "' class='allactions' style='display:none' hasActionsCol='"+hasActionsCol+"' >" + actionsDiv + "</div>";
html += "\n<script type='text/javascript'>" html += "\n<script type='text/javascript'>"
html += "\n initActions('" + this.ID + "', "+(device.test(device.isTouch)?1:0)+")" html += "\n initActions('" + this.ID + "', "+(device.test(device.isTouch)?1:0)+")"