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

using egw.is_popup() which deals with situation of egw main-window having an opener (eg. bookmark)

Browse Source
This commit is contained in:
Ralf Becker 2014-05-13 06:44:50 +00:00
parent 1ccc8f9e0d
commit ac220a6e82
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,9 +92,9 @@ var AppJS = Class.extend(
this.egw = egw(this.appname, window);
// Initialize sidebox for non-popups.
// Initialize sidebox for non-popups.
// ID set server side
if(window.opener == null)
if(!this.egw.is_popup())
{
var sidebox = jQuery('#favorite_sidebox_'+this.appname);
if(sidebox.length == 0 && egw_getFramework() != null)
@ -422,15 +422,15 @@ var AppJS = Class.extend(
// Stop the normal bubbling if this is called on click
return false;
},
/**
* Update favorite items in nm fav. menu
*
* Update favorite items in nm fav. menu
*
*/
_refresh_fav_nm: function ()
{
var self = this;
if(etemplate2 && etemplate2.getByApplication)
{
var et2 = etemplate2.getByApplication(self.appname);
@ -447,7 +447,7 @@ var AppJS = Class.extend(
throw new Error ("_refresh_fav_nm():Either et2 is not ready/ not there yet. Make sure that etemplate2 is ready before call this method.");
}
},
/**
* Create the "Add new" popup dialog
*/