extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 17:33:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Precautions for iframes + sidebox

Browse Source 
- 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:
Nathan Gray 2014-04-29 16:51:57 +00:00
parent 5c19f99d9d
commit 4d016169e7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
phpgwapi/js/jsapi/app_base.js
View File

@ -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()
@ -319,7 +328,7 @@ var AppJS = Class.extend(
} }
}) })
.addClass("ui-helper-clearfix"); .addClass("ui-helper-clearfix");
//Add Sortable handler to sideBox fav. menu //Add Sortable handler to sideBox fav. menu
jQuery('ul','#favorite_sidebox_'+this.appname).sortable({ jQuery('ul','#favorite_sidebox_'+this.appname).sortable({
@ -330,10 +339,10 @@ var AppJS = Class.extend(
var favSortedList = jQuery(this).sortable('toArray', {attribute:'data-id'}); var favSortedList = jQuery(this).sortable('toArray', {attribute:'data-id'});
self.egw.set_preference(self.appname,'fav_sort_pref',favSortedList); self.egw.set_preference(self.appname,'fav_sort_pref',favSortedList);
self._refresh_fav_nm(); self._refresh_fav_nm();
} }
}); });
return true; return true;
} }
return false; return false;