Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #104 from ONLYOFFICE/feature/bugfix5.1.3

Browse source 
Feature/bugfix5.1.3
This commit is contained in:
maxkadushkin 2018-04-27 16:36:46 +03:00 committed by GitHub
parent 272fc79fe6 06a400880d
commit c3857323b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/common/main/lib/controller/Desktop.js
View file

@ -50,21 +50,26 @@ define([
_.extend(config, opts); _.extend(config, opts);
if ( config.isDesktopApp ) { if ( config.isDesktopApp ) {
Common.NotificationCenter.on('app:ready', function (config) { Common.NotificationCenter.on('app:ready', function (opts) {
_.extend(config, opts);
!!app && app.execCommand('doc:onready', ''); !!app && app.execCommand('doc:onready', '');
}); });
} }
}, },
process: function (opts) { process: function (opts) {
if ( opts == 'goback' ) { if ( config.isDesktopApp && !!app ) {
if ( config.isDesktopApp && !!app ) { if ( opts == 'goback' ) {
app.execCommand('go:folder', app.execCommand('go:folder',
config.isOffline ? 'offline' : config.customization.goback.url); config.isOffline ? 'offline' : config.customization.goback.url);
return true; return true;
} else
if ( opts == 'preloader:hide' ) {
app.execCommand('editor:onready', '');
return true;
} }
return false;
} }
return false;
} }
}; };
}; };

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -1589,6 +1589,8 @@ define([
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');
$('#loading-mask').hide().remove(); $('#loading-mask').hide().remove();
Common.Controllers.Desktop.process('preloader:hide');
}, },
onDownloadUrl: function(url) { onDownloadUrl: function(url) {

2
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1332,6 +1332,8 @@ define([
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');
$('#loading-mask').hide().remove(); $('#loading-mask').hide().remove();
Common.Controllers.Desktop.process('preloader:hide');
}, },
onDownloadUrl: function(url) { onDownloadUrl: function(url) {

2
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1468,6 +1468,8 @@ define([
this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction}); this.stackLongActions.pop({id: InitApplication, type: Asc.c_oAscAsyncActionType.BlockInteraction});
Common.NotificationCenter.trigger('layout:changed', 'main'); Common.NotificationCenter.trigger('layout:changed', 'main');
$('#loading-mask').hide().remove(); $('#loading-mask').hide().remove();
Common.Controllers.Desktop.process('preloader:hide');
}, },
onDownloadUrl: function(url) { onDownloadUrl: function(url) {