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

Merge pull request #1190 from ONLYOFFICE/fix/bugfix

Browse source 
[SSE] Disable view and layout tab when cell is edited
This commit is contained in:
Julia Radzhabova 2021-09-21 14:07:35 +03:00 committed by GitHub
parent f1067b9968 4515e5a14d
commit 7ff2e4b1f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1239,7 +1239,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pageorient', iconCls: 'toolbar__icon btn-pageorient',
caption: me.capBtnPageOrient, caption: me.capBtnPageOrient,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.editCell, _set.selRangeEdit],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
cls: 'ppm-toolbar', cls: 'ppm-toolbar',
items: [ items: [
@ -1279,7 +1279,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagemargins', iconCls: 'toolbar__icon btn-pagemargins',
caption: me.capBtnMargins, caption: me.capBtnMargins,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.editCell, _set.selRangeEdit],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
{ {
@ -1327,7 +1327,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagesize', iconCls: 'toolbar__icon btn-pagesize',
caption: me.capBtnPageSize, caption: me.capBtnPageSize,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.editCell, _set.selRangeEdit],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
restoreHeight: true, restoreHeight: true,
items: [ items: [
@ -1495,7 +1495,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-scale', iconCls: 'toolbar__icon btn-scale',
caption: me.capBtnScale, caption: me.capBtnScale,
lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], lock: [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.editCell, _set.selRangeEdit],
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [], items: [],
cls: 'scale-menu'}), cls: 'scale-menu'}),
@ -1561,7 +1561,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-print-titles', iconCls: 'toolbar__icon btn-print-titles',
caption: me.capBtnPrintTitles, caption: me.capBtnPrintTitles,
lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.selRangeEdit], lock : [_set.docPropsLock, _set.lostConnect, _set.coAuth, _set.editCell, _set.selRangeEdit],
dataHint : '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'

19
apps/spreadsheeteditor/main/app/view/ViewTab.js
View file

@ -97,7 +97,7 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-sheet-view', iconCls: 'toolbar__icon btn-sheet-view',
caption: me.capBtnSheetView, caption: me.capBtnSheetView,
lock : [_set.lostConnect, _set.coAuth], lock : [_set.lostConnect, _set.coAuth, _set.editCell],
menu: true, menu: true,
dataHint : '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
@ -110,7 +110,7 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-sheet-view-new', iconCls : 'toolbar__icon btn-sheet-view-new',
caption : this.textCreate, caption : this.textCreate,
lock : [_set.coAuth, _set.lostConnect], lock : [_set.coAuth, _set.lostConnect, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'big'
@ -123,7 +123,7 @@ define([
cls : 'btn-toolbar', cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-sheet-view-close', iconCls : 'toolbar__icon btn-sheet-view-close',
caption : this.textClose, caption : this.textClose,
lock : [_set.sheetView, _set.coAuth, _set.lostConnect], lock : [_set.sheetView, _set.coAuth, _set.lostConnect, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'big' dataHintOffset: 'big'
@ -138,7 +138,7 @@ define([
iconCls: 'toolbar__icon btn-freeze-panes', iconCls: 'toolbar__icon btn-freeze-panes',
caption: this.capBtnFreeze, caption: this.capBtnFreeze,
menu: true, menu: true,
lock: [_set.sheetLock, _set.lostConnect, _set.coAuth], lock: [_set.sheetLock, _set.lostConnect, _set.coAuth, _set.editCell],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -151,7 +151,7 @@ define([
menuStyle : 'min-width: 55px;', menuStyle : 'min-width: 55px;',
hint : me.tipFontSize, hint : me.tipFontSize,
editable : false, editable : false,
lock : [_set.coAuth, _set.lostConnect], lock : [_set.coAuth, _set.lostConnect, _set.editCell],
data : [ data : [
{ displayValue: "50%", value: 50 }, { displayValue: "50%", value: 50 },
{ displayValue: "75%", value: 75 }, { displayValue: "75%", value: 75 },
@ -166,12 +166,13 @@ define([
dataHintOffset: 'small' dataHintOffset: 'small'
}); });
this.cmbZoom.setValue(100); this.cmbZoom.setValue(100);
this.lockedControls.push(this.cmbZoom);
this.chFormula = new Common.UI.CheckBox({ this.chFormula = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-formula'), el: $host.findById('#slot-chk-formula'),
labelText: this.textFormula, labelText: this.textFormula,
value: !Common.localStorage.getBool('sse-hidden-formula'), value: !Common.localStorage.getBool('sse-hidden-formula'),
lock : [_set.lostConnect, _set.coAuth], lock : [_set.lostConnect, _set.coAuth, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -181,7 +182,7 @@ define([
this.chHeadings = new Common.UI.CheckBox({ this.chHeadings = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-heading'), el: $host.findById('#slot-chk-heading'),
labelText: this.textHeadings, labelText: this.textHeadings,
lock : [_set.sheetLock, _set.lostConnect, _set.coAuth], lock : [_set.sheetLock, _set.lostConnect, _set.coAuth, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -191,7 +192,7 @@ define([
this.chGridlines = new Common.UI.CheckBox({ this.chGridlines = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-gridlines'), el: $host.findById('#slot-chk-gridlines'),
labelText: this.textGridlines, labelText: this.textGridlines,
lock : [_set.sheetLock, _set.lostConnect, _set.coAuth], lock : [_set.sheetLock, _set.lostConnect, _set.coAuth, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -201,7 +202,7 @@ define([
this.chZeros = new Common.UI.CheckBox({ this.chZeros = new Common.UI.CheckBox({
el: $host.findById('#slot-chk-zeros'), el: $host.findById('#slot-chk-zeros'),
labelText: this.textZeros, labelText: this.textZeros,
lock : [_set.sheetLock, _set.lostConnect, _set.coAuth], lock : [_set.sheetLock, _set.lostConnect, _set.coAuth, _set.editCell],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'