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

Merge pull request #836 from ONLYOFFICE/fix/list-settings

Browse source 
[DE] Show current level of list
This commit is contained in:
Julia Radzhabova 2021-04-23 18:03:21 +03:00 committed by GitHub
parent c9f9a3ef24 5a0161b352
commit c9ef92f3f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1414,7 +1414,11 @@ define([
onChangeLevelShowAfter: function(type, menu) {
var me = this;
var listId = me.api.asc_GetCurrentNumberingId(),
level = me.api.asc_GetCurrentNumberingLvl(),
props = (listId !== null) ? me.api.asc_GetNumberingPr(listId) : null;
var item = _.find(menu.items, function(item) { return item.options.level == level; });
menu.clearAll();
item && item.setChecked(true);
if (props) {
this.api.SetDrawImagePreviewBulletChangeListLevel(menu.options.previewIds, props);
}

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

@ -1699,7 +1699,7 @@ define([
var items = [], ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-markers-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true });
}
this.btnMarkers.setMenu(
new Common.UI.Menu({
@ -1731,7 +1731,7 @@ define([
items = []; ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-numbering-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true });
}
this.btnNumbers.setMenu(
new Common.UI.Menu({
@ -1761,7 +1761,7 @@ define([
items = []; ids = [];
for (var i=0; i<9; i++) {
ids.push('id-toolbar-menu-multilevels-level-' + i);
items.push({template: levelTemplate, previewId: ids[i], level: i });
items.push({template: levelTemplate, previewId: ids[i], level: i, checkable: true });
}
this.btnMultilevels.setMenu(
new Common.UI.Menu({

7
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -218,11 +218,16 @@
background-color: @canvas-content-background;
}
a:hover {
a:hover, a:focus, a.checked {
background-color: transparent;
.menu-list-preview {
.box-shadow(0 0 0 2px @border-control-focus-ie);
.box-shadow(0 0 0 @scaled-two-px-value @border-control-focus);
}
}
a.checked {
&:before {
display: none !important;
}
}
}