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

FSN#38071 syntax verbetering en checkRelated is wat solider gemaakt.

Browse Source 
svn path=/Website/trunk/; revision=32031
This commit is contained in:
Koen Reefman
2016-12-19 16:19:06 +00:00
parent dffd96d62d
commit b3657b704e
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/FAC/Facilitor.asp
View File

@@ -272,9 +272,9 @@ if (device.test(device.isTouch)) { %>
$('.ui-tabs-submenu, .menuDropDown, li.mi')
.on('click.nameSpace', handler);
window.myResize(!!!noAnim);
window.myResize(!noAnim);
setTimeout(menuToggles , 300);
setTimeout(menuToggles , !noAnim ? 300 : 0);
$('#menutabs').children("input").toggle();
}
else

22
APPL/Localscripts/resultset_table_v2.js
View File

@@ -313,18 +313,26 @@ function updateEventHandlers(showingInline)
}
}
// find if anything in array 'haystack' matches anything in array 'arr'
var matchAny = function (haystack, arr) {
return arr.some(function (v) {
return haystack.indexOf(v) >= 0;
});
};
// Checks whether the related class should trigger hideActions() or keep the inline-actions menu open (used for useHamb == 2)
var checkRelated = function(e) {
if (!e.relatedTarget)
return false;
var tg = e.target.className
var related = e.relatedTarget.className;
if (related != "allactions" && tg != "allactions" && tg != "ia2" && related != "ia2" &&
var tg = e.target.className.split(" ");
var related = e.relatedTarget.className.split(" ");
var inlineClasses = ["allactions", "ia2"];
if (!matchAny(related.concat(tg), inlineClasses) &&
$(e.target).closest("tr").attr("ROWKEY") !== $(e.relatedTarget).closest("tr").attr("ROWKEY"))
return false;
var relatedArray = ['hamburger', 'allactions', 'fa-bars', 'hambCont', 'ia2'];
for (var i = 0; i < relatedArray.length; i++)
if (related.indexOf(relatedArray[i]) != -1)
return true;
var relatedArray = ["hambCont", "allactions"];
if ($(e.relatedTarget).parents(".hambCont")[0] || $(e.relatedTarget).parents(".allactions")[0] || matchAny(related, relatedArray))
return true;
return false;
}