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

Merge pull request #735 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-03-09 17:41:46 +03:00 committed by GitHub
parent 35b04fd4f7 8974612ff4
commit 09f0ccd20e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 38 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/common/main/lib/controller/Plugins.js
View file

@ -646,20 +646,24 @@ define([
warn = false; warn = false;
if (plugins.plugins && plugins.plugins.length>0) if (plugins.plugins && plugins.plugins.length>0)
arr = plugins.plugins; arr = plugins.plugins;
var val = plugins.config.autostart || plugins.config.autoStartGuid; if (plugins && plugins.config) {
if (typeof (val) == 'string') var val = plugins.config.autostart || plugins.config.autoStartGuid;
val = [val]; if (typeof (val) == 'string')
warn = !!plugins.config.autoStartGuid; val = [val];
autostart = val || []; warn = !!plugins.config.autoStartGuid;
autostart = val || [];
}
plugins = this.serverPlugins; plugins = this.serverPlugins;
if (plugins.plugins && plugins.plugins.length>0) if (plugins.plugins && plugins.plugins.length>0)
arr = arr.concat(plugins.plugins); arr = arr.concat(plugins.plugins);
val = plugins.config.autostart || plugins.config.autoStartGuid; if (plugins && plugins.config) {
if (typeof (val) == 'string') val = plugins.config.autostart || plugins.config.autoStartGuid;
val = [val]; if (typeof (val) == 'string')
(warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration."); val = [val];
autostart = autostart.concat(val || []); (warn || plugins.config.autoStartGuid) && console.warn("Obsolete: The autoStartGuid parameter is deprecated. Please check the documentation for new plugin connection configuration.");
autostart = autostart.concat(val || []);
}
this.autostart = autostart; this.autostart = autostart;
this.parsePlugins(arr, false); this.parsePlugins(arr, false);

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

@ -156,7 +156,7 @@ define([
weakCompare : function(obj1, obj2){return obj1.type === obj2.type;} weakCompare : function(obj1, obj2){return obj1.type === obj2.type;}
}); });
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false, isDocModified: false};
this.languages = null; this.languages = null;
// Initialize viewport // Initialize viewport
@ -1798,7 +1798,7 @@ define([
if (window.document.title != title) if (window.document.title != title)
window.document.title = title; window.document.title = title;
Common.Gateway.setDocumentModified(isModified); this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
if (isModified && (!this._state.fastCoauth || this._state.usersCount<2)) if (isModified && (!this._state.fastCoauth || this._state.usersCount<2))
this.getApplication().getController('Statusbar').setStatusCaption('', true); this.getApplication().getController('Statusbar').setStatusCaption('', true);
@ -1809,7 +1809,7 @@ define([
onDocumentModifiedChanged: function() { onDocumentModifiedChanged: function() {
var isModified = this.api.asc_isDocumentCanSave(); var isModified = this.api.asc_isDocumentCanSave();
if (this._state.isDocModified !== isModified) { if (this._state.isDocModified !== isModified) {
Common.Gateway.setDocumentModified(this.api.isDocumentModified()); this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
} }
this.updateWindowTitle(); this.updateWindowTitle();

7
apps/documenteditor/mobile/app/controller/Main.js
View file

@ -80,7 +80,8 @@ define([
usersCount : 1, usersCount : 1,
fastCoauth : true, fastCoauth : true,
lostEditingRights : false, lostEditingRights : false,
licenseType : false licenseType : false,
isDocModified: false
}; };
// Initialize viewport // Initialize viewport
@ -1144,7 +1145,7 @@ define([
if (window.document.title != title) if (window.document.title != title)
window.document.title = title; window.document.title = title;
Common.Gateway.setDocumentModified(isModified); this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
this._state.isDocModified = isModified; this._state.isDocModified = isModified;
} }
}, },
@ -1152,7 +1153,7 @@ define([
onDocumentModifiedChanged: function() { onDocumentModifiedChanged: function() {
var isModified = this.api.asc_isDocumentCanSave(); var isModified = this.api.asc_isDocumentCanSave();
if (this._state.isDocModified !== isModified) { if (this._state.isDocModified !== isModified) {
Common.Gateway.setDocumentModified(this.api.isDocumentModified()); this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
} }
this.updateWindowTitle(); this.updateWindowTitle();

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

@ -134,7 +134,7 @@ define([
onLaunch: function() { onLaunch: function() {
var me = this; var me = this;
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false, isDocModified: false};
this.languages = null; this.languages = null;
window.storagename = 'presentation'; window.storagename = 'presentation';
@ -1469,7 +1469,7 @@ define([
if ( window.document.title != title ) if ( window.document.title != title )
window.document.title = title; window.document.title = title;
Common.Gateway.setDocumentModified(isModified); this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
if (isModified && (!this._state.fastCoauth || this._state.usersCount<2)) if (isModified && (!this._state.fastCoauth || this._state.usersCount<2))
this.getApplication().getController('Statusbar').setStatusCaption('', true); this.getApplication().getController('Statusbar').setStatusCaption('', true);
@ -1483,7 +1483,7 @@ define([
onDocumentModifiedChanged: function() { onDocumentModifiedChanged: function() {
var isModified = this.api.asc_isDocumentCanSave(); var isModified = this.api.asc_isDocumentCanSave();
if (this._state.isDocModified !== isModified) { if (this._state.isDocModified !== isModified) {
Common.Gateway.setDocumentModified(this.api.isDocumentModified()); this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
} }
this.updateWindowTitle(); this.updateWindowTitle();

7
apps/presentationeditor/mobile/app/controller/Main.js
View file

@ -80,7 +80,8 @@ define([
usersCount : 1, usersCount : 1,
fastCoauth : true, fastCoauth : true,
lostEditingRights : false, lostEditingRights : false,
licenseType : false licenseType : false,
isDocModified: false
}; };
// Initialize viewport // Initialize viewport
@ -1063,7 +1064,7 @@ define([
if (window.document.title != title) if (window.document.title != title)
window.document.title = title; window.document.title = title;
Common.Gateway.setDocumentModified(isModified); this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
this._state.isDocModified = isModified; this._state.isDocModified = isModified;
} }
}, },
@ -1071,7 +1072,7 @@ define([
onDocumentModifiedChanged: function() { onDocumentModifiedChanged: function() {
var isModified = this.api.asc_isDocumentCanSave(); var isModified = this.api.asc_isDocumentCanSave();
if (this._state.isDocModified !== isModified) { if (this._state.isDocModified !== isModified) {
Common.Gateway.setDocumentModified(this.api.isDocumentModified()); this._isDocReady && Common.Gateway.setDocumentModified(this.api.isDocumentModified());
} }
this.updateWindowTitle(); this.updateWindowTitle();

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

@ -161,7 +161,7 @@ define([
// $(document.body).css('position', 'absolute'); // $(document.body).css('position', 'absolute');
var me = this; var me = this;
this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false}; this._state = {isDisconnected: false, usersCount: 1, fastCoauth: true, lostEditingRights: false, licenseType: false, isDocModified: false};
if (!Common.Utils.isBrowserSupported()){ if (!Common.Utils.isBrowserSupported()){
Common.Utils.showBrowserRestriction(); Common.Utils.showBrowserRestriction();
@ -1739,7 +1739,7 @@ define([
window.document.title = title; window.document.title = title;
} }
Common.Gateway.setDocumentModified(change); this._isDocReady && (this._state.isDocModified !== change) && Common.Gateway.setDocumentModified(change);
this._state.isDocModified = change; this._state.isDocModified = change;
} }
@ -1750,8 +1750,10 @@ define([
onDocumentModifiedChanged: function(change) { onDocumentModifiedChanged: function(change) {
this.updateWindowTitle(change); this.updateWindowTitle(change);
Common.Gateway.setDocumentModified(change); if (this._state.isDocModified !== change) {
this._isDocReady && Common.Gateway.setDocumentModified(change);
}
if (this.toolbarView && this.toolbarView.btnCollabChanges && this.api) { if (this.toolbarView && this.toolbarView.btnCollabChanges && this.api) {
var isSyncButton = this.toolbarView.btnCollabChanges.cmpEl.hasClass('notify'), var isSyncButton = this.toolbarView.btnCollabChanges.cmpEl.hasClass('notify'),
forcesave = this.appOptions.forcesave, forcesave = this.appOptions.forcesave,

7
apps/spreadsheeteditor/mobile/app/controller/Main.js
View file

@ -81,7 +81,8 @@ define([
usersCount : 1, usersCount : 1,
fastCoauth : true, fastCoauth : true,
lostEditingRights : false, lostEditingRights : false,
licenseType : false licenseType : false,
isDocModified: false
}; };
// Initialize viewport // Initialize viewport
@ -1209,7 +1210,7 @@ define([
if (window.document.title != title) if (window.document.title != title)
window.document.title = title; window.document.title = title;
Common.Gateway.setDocumentModified(isModified); this._isDocReady && (this._state.isDocModified !== isModified) && Common.Gateway.setDocumentModified(isModified);
this._state.isDocModified = isModified; this._state.isDocModified = isModified;
} }
}, },
@ -1217,7 +1218,7 @@ define([
onDocumentModifiedChanged: function() { onDocumentModifiedChanged: function() {
var isModified = this.api.asc_isDocumentCanSave(); var isModified = this.api.asc_isDocumentCanSave();
if (this._state.isDocModified !== isModified) { if (this._state.isDocModified !== isModified) {
Common.Gateway.setDocumentModified(this.api.asc_isDocumentModified()); this._isDocReady && Common.Gateway.setDocumentModified(this.api.asc_isDocumentModified());
} }
this.updateWindowTitle(); this.updateWindowTitle();