mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-25 17:33:49 +01:00
Precautions for iframes + sidebox
- Unbind any existing events on existing sidebox, if _init_sidebox() is called again - Only call _init_sidebox() on top-level window's app.js, fixes some iframe issues with admin
This commit is contained in:
parent
5c19f99d9d
commit
4d016169e7
@ -99,7 +99,15 @@ var AppJS = Class.extend(
|
|||||||
var egw_fw = egw_getFramework();
|
var egw_fw = egw_getFramework();
|
||||||
sidebox= $j('#favorite_sidebox_'+this.appname,egw_fw.sidemenuDiv);
|
sidebox= $j('#favorite_sidebox_'+this.appname,egw_fw.sidemenuDiv);
|
||||||
}
|
}
|
||||||
this._init_sidebox(sidebox);
|
// Make sure we're running in the top window when we init sidebox
|
||||||
|
if(window.top.app[this.appname] !== this)
|
||||||
|
{
|
||||||
|
window.top.app[this.appname]._init_sidebox(sidebox);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
this._init_sidebox(sidebox);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -302,6 +310,7 @@ var AppJS = Class.extend(
|
|||||||
if(sidebox.length)
|
if(sidebox.length)
|
||||||
{
|
{
|
||||||
var self = this;
|
var self = this;
|
||||||
|
if(this.sidebox) this.sidebox.off();
|
||||||
this.sidebox = sidebox;
|
this.sidebox = sidebox;
|
||||||
sidebox
|
sidebox
|
||||||
.off()
|
.off()
|
||||||
|
Loading…
Reference in New Issue
Block a user