holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed changing to a non-toplevel / iframe url did NOT allow to return to a top-level (ajax=true) one, because browser.currentLocation was not updated for iframe

Browse Source
This commit is contained in:
Ralf Becker 2015-03-18 09:57:23 +00:00
parent b68d7f7274
commit ea4e3ef433
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/js/framework/fw_browser.js
View File

@ -220,6 +220,9 @@ var fw_browser = Class.extend({
catch(e) {} // catch error if eg. SiteMgr runs a different origin, otherwise tab cant be closed catch(e) {} // catch error if eg. SiteMgr runs a different origin, otherwise tab cant be closed
} }
// Save the actual url which has been passed as parameter
this.currentLocation = _url;
//Set the browser type //Set the browser type
if (useIframe) if (useIframe)
{ {
@ -258,9 +261,6 @@ var fw_browser = Class.extend({
{ {
this.setBrowserType(EGW_BROWSER_TYPE_DIV); this.setBrowserType(EGW_BROWSER_TYPE_DIV);
// Save the actual url which has been passed as parameter
this.currentLocation = _url;
//Special treatement of "about:blank" //Special treatement of "about:blank"
if (targetUrl == "about:blank") if (targetUrl == "about:blank")
{ {