extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ugly hack to get group selection in calendar 14.2 working

Browse Source
This commit is contained in:
Hadi Nategh 2015-11-04 14:11:42 +00:00
parent b8471bb1db
commit e0cfd00582
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,7 +579,11 @@ var AppJS = Class.extend(
<ul id="'+this.appname+'_favorites_popup_state"/>\ <ul id="'+this.appname+'_favorites_popup_state"/>\
</form>\ </form>\
</div>' </div>'
).appendTo(this.et2 ? this.et2.getDOMNode() : $j('body')); // Ugly hack to exclude calendar from using this.et2 since calendar in 14.3
// still running under iframe and that gets into conflict with et2 object created for
// video tutorials in sidebox.
// TODO: this.appname != 'calendar' should be removed after we released new calendar
).appendTo(this.et2 && this.appname != 'calendar' ? this.et2.getDOMNode() : $j('body'));
$j(".ui-icon-circle-plus",this.favorite_popup).prev().andSelf().click(function() { $j(".ui-icon-circle-plus",this.favorite_popup).prev().andSelf().click(function() {
var details = $j("#"+self.appname+"_favorites_popup_state",self.favorite_popup) var details = $j("#"+self.appname+"_favorites_popup_state",self.favorite_popup)
@ -599,7 +603,11 @@ var AppJS = Class.extend(
empty_label: "Groups", empty_label: "Groups",
no_lang: true, no_lang: true,
parent_node: this.appname+'_favorites_popup_admin' parent_node: this.appname+'_favorites_popup_admin'
},this.et2 || null); // Ugly hack to exclude calendar from using this.et2 since calendar in 14.3
// still running under iframe and that gets into conflict with et2 object created for
// video tutorials in sidebox.
// TODO: this.appname != 'calendar' should be removed after we released new calendar
},(this.et2 && this.appname != 'calendar'? this.et2:null));
this.favorite_popup.group.loadingFinished(); this.favorite_popup.group.loadingFinished();
} }