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

Do not show loading prompt for popups

Browse Source
This commit is contained in:
Nathan Gray 2016-04-06 15:19:24 +00:00
parent ffaeb52bce
commit 8df7c00b21
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/js/app.js
View File

@ -91,16 +91,18 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend(
window.app.calendar = window.top.app.calendar; window.app.calendar = window.top.app.calendar;
return; return;
} }
else if (window.top == window && !egw(window).is_popup())
// call parent {
this._super.apply(this, arguments);
// Show loading div // Show loading div
egw.loading_prompt( egw.loading_prompt(
this.appname,true,egw.lang('please wait...'), this.appname,true,egw.lang('please wait...'),
framework.applications.calendar.tab.contentDiv, framework.applications.calendar.tab.contentDiv,
egwIsMobile()?'horizental':'spinner' egwIsMobile()?'horizental':'spinner'
); );
}
// call parent
this._super.apply(this, arguments);
// Scroll // Scroll
jQuery(jQuery.proxy(this._scroll,this)); jQuery(jQuery.proxy(this._scroll,this));