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

FSN#41113 laatste confirm() -> FcltMgr.confirm()

Browse Source 
svn path=/Website/branches/v2017.1/; revision=34521
This commit is contained in:
Koen Reefman
2017-07-05 08:50:42 +00:00
parent 6a2f546ec0
commit ea79c980d6
3 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/CAD/default.asp
View File

@@ -481,12 +481,11 @@ if (scenario_key != 0)
if (SlnkEvent.fromKey != -1 && SlnkEvent.fromDwgX) // Nieuwe plek
{
//if (SlnkEvent.ContourLayer != 'SLNK Contours')
// if (!confirm("Buiten ruimte geplaatst. Doorgaan?"))
// return;
DoMoveSymbol(SlnkEvent.fromKey,
SlnkEvent.fromDwgX, SlnkEvent.fromDwgY,
SlnkEvent.dwgX, SlnkEvent.dwgY, SlnkEvent.ContourKey)
//FcltMgr.confirm("Buiten ruimte geplaatst. Doorgaan?", function() {
// DoMoveSymbol(SlnkEvent.fromKey,
// SlnkEvent.fromDwgX, SlnkEvent.fromDwgY,
// SlnkEvent.dwgX, SlnkEvent.dwgY, SlnkEvent.ContourKey)
//});
}
break;
}

5
APPL/FAC/fac_fiattering_list.asp
View File

@@ -360,8 +360,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
function fin_reject(fin_key_array)
{
if (confirm(L("lcl_reject") + "?"))
{
FcltMgr.confirm(L("lcl_reject") + "?", function() {
var data = { fin_key: fin_key_array.join(",") };
protectRequest.dataToken(data);
$.post("../fin/fin_approve.asp?r=1",
@@ -371,7 +370,7 @@ FCLTHeader.Requires({ plugins: ["jQuery"], js: ["jquery-ui.js"] });
one_done(module);
},
"json");
}
});
}
function off_reject(off_key_array)

56
APPL/Localscripts/FcltMgr.js
View File

@@ -438,40 +438,35 @@ var FcltMgr =
// Opzoeken voordat hij verwijderd is
var idx = $('li', this._$tabshost).index(li);
var isCurrent = (idx == this._$tabshost.tabs('option', 'active'));
var hotwnd = FcltMgr._pageManager._panelHot(li);
if (hotwnd)
{
if (!confirm(L("lcl_shared_closeandignore")))
{
// Alleen unlocken als we zelf het lock hadden
return false;
}
else
{
if (hotwnd.onCloseHot)
hotwnd.onCloseHot();
}
}
var openerId = $( li ).attr("openerId");
var panelId = $( li ).remove().attr( "aria-controls" );
FcltMgr._removeIframe($( "#" + panelId ));
if (!params.noRefresh)
{ // Probeer de 'opener' tab te activeren als je zelf actief bent
if (isCurrent)
{
var prevLi = $("a#" + openerId, this._$tabshost);
if (prevLi.length)
var that = this;
FcltMgr.confirm(L("lcl_shared_closeandignore"), {autoconfirm: !hotwnd }, function() {
if (hotwnd && hotwnd.onCloseHot)
hotwnd.onCloseHot();
var openerId = $( li ).attr("openerId");
var panelId = $( li ).remove().attr( "aria-controls" );
FcltMgr._removeIframe($( "#" + panelId ));
if (!params.noRefresh)
{ // Probeer de 'opener' tab te activeren als je zelf actief bent
if (isCurrent)
{
var idx = $('a', this._$tabshost).index(prevLi[0]);
if (idx > -1)
this._$tabshost.tabs('option', 'active', idx);
var prevLi = $("a#" + openerId, that._$tabshost);
if (prevLi.length)
{
var idx = $('a', that._$tabshost).index(prevLi[0]);
if (idx > -1)
that._$tabshost.tabs('option', 'active', idx);
}
}
that._$tabshost.tabs( "refresh" );
}
this._$tabshost.tabs( "refresh" );
}
});
return;
},
@@ -1316,8 +1311,11 @@ try
if (this.userId && !String(this.userId).match(/\/\-1$/)
&& parent && parent.userId && !String(parent.userId).match(/\/\-1$/)
&& this.userId != parent.userId)
if (confirm("Unexpected change from user " + parent.userId + " to " + this.userId + "\nReload FACILITOR?"))
{
FcltMgr.confirm("Unexpected change from user " + parent.userId + " to " + this.userId + "\nReload FACILITOR?", function() {
top.location.reload();
});
}
if (parent && parent.FcltMgr && parent.FcltMgr != FcltMgr)
{