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

Merge pull request #1625 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2022-03-14 13:31:55 +03:00 committed by GitHub
parent 8323ac2934 0422d98753
commit ca553d8017
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -966,6 +966,7 @@ define([
} }
if ( id == Asc.c_oAscAsyncAction['Disconnect']) { if ( id == Asc.c_oAscAsyncAction['Disconnect']) {
this._state.timerDisconnect && clearTimeout(this._state.timerDisconnect);
this.disableEditing(false, true); this.disableEditing(false, true);
this.getApplication().getController('Statusbar').hideDisconnectTip(); this.getApplication().getController('Statusbar').hideDisconnectTip();
this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect);
@ -1073,7 +1074,9 @@ define([
this.disableEditing(true, true); this.disableEditing(true, true);
var me = this; var me = this;
statusCallback = function() { statusCallback = function() {
me.getApplication().getController('Statusbar').showDisconnectTip(); me._state.timerDisconnect = setTimeout(function(){
me.getApplication().getController('Statusbar').showDisconnectTip();
}, me._state.unloadTimer || 0);
}; };
break; break;
@ -2082,12 +2085,15 @@ define([
if (this.api.isDocumentModified()) { if (this.api.isDocumentModified()) {
var me = this; var me = this;
this.api.asc_stopSaving(); this.api.asc_stopSaving();
this._state.unloadTimer = 1000;
this.continueSavingTimer = window.setTimeout(function() { this.continueSavingTimer = window.setTimeout(function() {
me.api.asc_continueSaving(); me.api.asc_continueSaving();
me._state.unloadTimer = 0;
}, 500); }, 500);
return this.leavePageText; return this.leavePageText;
} } else
this._state.unloadTimer = 10000;
}, },
onUnload: function() { onUnload: function() {

6
apps/documenteditor/main/app/template/Toolbar.template
View file

@ -135,11 +135,11 @@
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<span class="btn-slot text x-huge" id="slot-img-align"></span> <span class="btn-slot text x-huge" id="slot-img-wrapping"></span>
<span class="btn-slot text x-huge" id="slot-img-group"></span>
<span class="btn-slot text x-huge" id="slot-img-movefrwd"></span> <span class="btn-slot text x-huge" id="slot-img-movefrwd"></span>
<span class="btn-slot text x-huge" id="slot-img-movebkwd"></span> <span class="btn-slot text x-huge" id="slot-img-movebkwd"></span>
<span class="btn-slot text x-huge" id="slot-img-wrapping"></span> <span class="btn-slot text x-huge" id="slot-img-align"></span>
<span class="btn-slot text x-huge" id="slot-img-group"></span>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">

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

@ -629,6 +629,7 @@ define([
this.synchronizeChanges(); this.synchronizeChanges();
if ( id == Asc.c_oAscAsyncAction['Disconnect']) { if ( id == Asc.c_oAscAsyncAction['Disconnect']) {
this._state.timerDisconnect && clearTimeout(this._state.timerDisconnect);
this.disableEditing(false, true); this.disableEditing(false, true);
this.getApplication().getController('Statusbar').hideDisconnectTip(); this.getApplication().getController('Statusbar').hideDisconnectTip();
this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect);
@ -726,7 +727,9 @@ define([
this.disableEditing(true, true); this.disableEditing(true, true);
var me = this; var me = this;
statusCallback = function() { statusCallback = function() {
me.getApplication().getController('Statusbar').showDisconnectTip(); me._state.timerDisconnect = setTimeout(function(){
me.getApplication().getController('Statusbar').showDisconnectTip();
}, me._state.unloadTimer || 0);
}; };
break; break;
@ -1700,12 +1703,15 @@ define([
if (this.api.isDocumentModified()) { if (this.api.isDocumentModified()) {
var me = this; var me = this;
this.api.asc_stopSaving(); this.api.asc_stopSaving();
this._state.unloadTimer = 1000;
this.continueSavingTimer = window.setTimeout(function() { this.continueSavingTimer = window.setTimeout(function() {
me.api.asc_continueSaving(); me.api.asc_continueSaving();
me._state.unloadTimer = 0;
}, 500); }, 500);
return this.leavePageText; return this.leavePageText;
} } else
this._state.unloadTimer = 10000;
}, },
onUnload: function() { onUnload: function() {

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

@ -714,6 +714,7 @@ define([
this.onEditComplete(this.loadMask, {restorefocus:true}); this.onEditComplete(this.loadMask, {restorefocus:true});
} }
if ( id == Asc.c_oAscAsyncAction['Disconnect']) { if ( id == Asc.c_oAscAsyncAction['Disconnect']) {
this._state.timerDisconnect && clearTimeout(this._state.timerDisconnect);
this.disableEditing(false, true); this.disableEditing(false, true);
this.getApplication().getController('Statusbar').hideDisconnectTip(); this.getApplication().getController('Statusbar').hideDisconnectTip();
this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect); this.getApplication().getController('Statusbar').setStatusCaption(this.textReconnect);
@ -800,7 +801,9 @@ define([
this.disableEditing(true, true); this.disableEditing(true, true);
var me = this; var me = this;
statusCallback = function() { statusCallback = function() {
me.getApplication().getController('Statusbar').showDisconnectTip(); me._state.timerDisconnect = setTimeout(function(){
me.getApplication().getController('Statusbar').showDisconnectTip();
}, me._state.unloadTimer || 0);
}; };
break; break;
@ -2069,12 +2072,15 @@ define([
if (isEdit && this.api.asc_isDocumentModified()) { if (isEdit && this.api.asc_isDocumentModified()) {
var me = this; var me = this;
this.api.asc_stopSaving(); this.api.asc_stopSaving();
this._state.unloadTimer = 1000;
this.continueSavingTimer = window.setTimeout(function() { this.continueSavingTimer = window.setTimeout(function() {
me.api.asc_continueSaving(); me.api.asc_continueSaving();
me._state.unloadTimer = 0;
}, 500); }, 500);
return this.leavePageText; return this.leavePageText;
} } else
this._state.unloadTimer = 10000;
}, },
onUnload: function() { onUnload: function() {

4
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -172,10 +172,10 @@
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">
<span class="btn-slot text x-huge" id="slot-img-align"></span>
<span class="btn-slot text x-huge" id="slot-img-group"></span>
<span class="btn-slot text x-huge" id="slot-img-movefrwd"></span> <span class="btn-slot text x-huge" id="slot-img-movefrwd"></span>
<span class="btn-slot text x-huge" id="slot-img-movebkwd"></span> <span class="btn-slot text x-huge" id="slot-img-movebkwd"></span>
<span class="btn-slot text x-huge" id="slot-img-align"></span>
<span class="btn-slot text x-huge" id="slot-img-group"></span>
</div> </div>
<div class="separator long"></div> <div class="separator long"></div>
<div class="group"> <div class="group">