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

Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

Browse source
This commit is contained in:
Maxim Kadushkin 2021-06-28 23:52:22 +03:00
parent bae484e6a4 97c7708d0d
commit 797a657ce5
5 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/documenteditor/main/app/view/Statusbar.js
View file

@ -322,6 +322,7 @@ define([
if (this.api) { if (this.api) {
this.api.asc_registerCallback('asc_onCountPages', _.bind(_onCountPages, this)); this.api.asc_registerCallback('asc_onCountPages', _.bind(_onCountPages, this));
this.api.asc_registerCallback('asc_onCurrentPage', _.bind(_onCurrentPage, this)); this.api.asc_registerCallback('asc_onCurrentPage', _.bind(_onCurrentPage, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
} }

4
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -2077,6 +2077,10 @@ define([
setMode: function (mode) { setMode: function (mode) {
if (mode.isDisconnected) { if (mode.isDisconnected) {
this.btnSave.setDisabled(true); this.btnSave.setDisabled(true);
this.btnUndo.setDisabled(true);
this.btnRedo.setDisabled(true);
if ( this.synchTooltip )
this.synchTooltip.hide();
if (!mode.enableDownload) if (!mode.enableDownload)
this.btnPrint.setDisabled(true); this.btnPrint.setDisabled(true);
} }

1
apps/presentationeditor/main/app/view/Statusbar.js
View file

@ -301,6 +301,7 @@ define([
this.api.asc_registerCallback('asc_onCountPages', _.bind(_onCountPages, this)); this.api.asc_registerCallback('asc_onCountPages', _.bind(_onCountPages, this));
this.api.asc_registerCallback('asc_onCurrentPage', _.bind(_onCurrentPage, this)); this.api.asc_registerCallback('asc_onCurrentPage', _.bind(_onCurrentPage, this));
this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this)); this.api.asc_registerCallback('asc_onFocusObject', _.bind(this.onApiFocusObject, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
} }

3
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1398,6 +1398,9 @@ define([
setMode: function (mode) { setMode: function (mode) {
if (mode.isDisconnected) { if (mode.isDisconnected) {
this.lockToolbar(PE.enumLock.lostConnect, true); this.lockToolbar(PE.enumLock.lostConnect, true);
this.lockToolbar( PE.enumLock.lostConnect, true, {array:[this.btnUndo,this.btnRedo,this.btnSave]} );
if ( this.synchTooltip )
this.synchTooltip.hide();
if (!mode.enableDownload) if (!mode.enableDownload)
this.lockToolbar(PE.enumLock.cantPrint, true, {array: [this.btnPrint]}); this.lockToolbar(PE.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else } else

5
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -396,6 +396,7 @@ define([
id : 'id-toolbar-btn-save', id : 'id-toolbar-btn-save',
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon no-mask ' + me.btnSaveCls, iconCls : 'toolbar__icon no-mask ' + me.btnSaveCls,
lock : [_set.lostConnect],
signals : ['disabled'] signals : ['disabled']
}); });
me.btnCollabChanges = me.btnSave; me.btnCollabChanges = me.btnSave;
@ -2213,7 +2214,9 @@ define([
if (mode.isDisconnected) { if (mode.isDisconnected) {
this.lockToolbar( SSE.enumLock.lostConnect, true ); this.lockToolbar( SSE.enumLock.lostConnect, true );
this.lockToolbar( SSE.enumLock.lostConnect, true, this.lockToolbar( SSE.enumLock.lostConnect, true,
{array:[this.btnEditChart, this.btnEditChartData, this.btnEditChartType, this.btnUndo,this.btnRedo]} ); {array:[this.btnEditChart, this.btnEditChartData, this.btnEditChartType, this.btnUndo,this.btnRedo,this.btnSave]} );
if ( this.synchTooltip )
this.synchTooltip.hide();
if (!mode.enableDownload) if (!mode.enableDownload)
this.lockToolbar(SSE.enumLock.cantPrint, true, {array: [this.btnPrint]}); this.lockToolbar(SSE.enumLock.cantPrint, true, {array: [this.btnPrint]});
} else { } else {