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

Merge pull request #968 from ONLYOFFICE/fix/bugfix

Browse source 
[DE] Fix Bug 50912
This commit is contained in:
Julia Radzhabova 2021-07-07 17:46:22 +03:00 committed by GitHub
parent d38e88f063 a1edc609b4
commit 4ada95809b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -895,6 +895,8 @@ define([
if (need_disable != toolbar.btnColumns.isDisabled()) if (need_disable != toolbar.btnColumns.isDisabled())
toolbar.btnColumns.setDisabled(need_disable); toolbar.btnColumns.setDisabled(need_disable);
toolbar.btnLineNumbers.setDisabled(in_image && in_para || this._state.lock_doc);
if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled())
toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined);
@ -1761,6 +1763,7 @@ define([
switch (item.value) { switch (item.value) {
case 0: case 0:
this._state.linenum = undefined;
this.api.asc_SetLineNumbersProps(Asc.c_oAscSectionApplyType.Current, null); this.api.asc_SetLineNumbersProps(Asc.c_oAscSectionApplyType.Current, null);
break; break;
case 1: case 1:

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

@ -1006,7 +1006,7 @@ define([
] ]
}) })
}); });
this.toolbarControls.push(this.btnLineNumbers);
this.btnClearStyle = new Common.UI.Button({ this.btnClearStyle = new Common.UI.Button({
id: 'id-toolbar-btn-clearstyle', id: 'id-toolbar-btn-clearstyle',