extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tutorial stops calendar sidebox from loading, happens only in FF

Browse Source
This commit is contained in:
Hadi Nategh 2016-06-09 17:40:16 +02:00
parent 24532ec3d7
commit feb09667ae
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
api/js/jsapi/app_base.js
View File

@ -702,11 +702,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
<ul id="'+this.appname+'_favorites_popup_state"/>\ <ul id="'+this.appname+'_favorites_popup_state"/>\
</form>\ </form>\
</div>' </div>'
// Ugly hack to exclude calendar from using this.et2 since calendar in 14.3 ).appendTo(this.et2 ? this.et2.getDOMNode() : jQuery('body'));
// 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() : jQuery('body'));
jQuery(".ui-icon-circle-plus",this.favorite_popup).prev().andSelf().click(function() { jQuery(".ui-icon-circle-plus",this.favorite_popup).prev().andSelf().click(function() {
var details = jQuery("#"+self.appname+"_favorites_popup_state",self.favorite_popup) var details = jQuery("#"+self.appname+"_favorites_popup_state",self.favorite_popup)
@ -726,11 +722,7 @@ var AppJS = (function(){ "use strict"; return 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'
// Ugly hack to exclude calendar from using this.et2 since calendar in 14.3 },(this.et2 || null));
// 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();
} }
@ -926,7 +918,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
if(!favorite || jQuery.isEmptyObject(favorite)) return; if(!favorite || jQuery.isEmptyObject(favorite)) return;
var match_count = 0; var match_count = 0;
var extra_keys = favorite.state ? var extra_keys = favorite.state ?
Object.keys(favorite.state) : // New Object.keys(favorite.state) : // New
Object.keys(favorite.filter); // Old Object.keys(favorite.filter); // Old
for(var state_key in state) for(var state_key in state)
@ -1128,9 +1120,13 @@ var AppJS = (function(){ "use strict"; return Class.extend(
{ {
var resolve = _resolve; var resolve = _resolve;
var reject = _reject; var reject = _reject;
self.egw.json('EGroupware\\Api\\Framework\\Tutorial::ajax_data', [self.egw.app_name()], function(_data){ // delay the execution and let the rendering catches up. Seems only FF problem
resolve(_data); window.setTimeout(function(){
}).sendRequest(); self.egw.json('EGroupware\\Api\\Framework\\Tutorial::ajax_data', [self.egw.app_name()], function(_data){
resolve(_data);
}).sendRequest();
},0);
}); });
}, },

2
api/js/jsapi/egw.js
View File

@ -332,7 +332,7 @@
{ {
if (_button_id == "show" ) if (_button_id == "show" )
{ {
egw.open_link(egw.link('/index.php', 'menuaction=home.home_tutorial_ui.popup&tuid=introduction-'+egw.preference('lang')+'-0-a'),'_blank','960x580'); egw.open_link(egw.link('/index.php', 'menuaction=api.EGroupware\\Api\\Framework\\Tutorial.popup&tuid=introduction-'+egw.preference('lang')+'-0-a'),'_blank','960x580');
} }
if(_button_id != "later") if(_button_id != "later")
{ {