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

Refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2021-07-09 13:24:24 +03:00
parent 1ca9c3d6a1
commit 54e23daafd
4 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/ColorButton.js
View file

@ -206,7 +206,7 @@ define([
}, },
focus: function() { focus: function() {
this.cmpEl && this.cmpEl.focus(); $('button', this.cmpEl).focus();
}, },
onAfterKeydownMenu: function(e) { onAfterKeydownMenu: function(e) {

2
apps/common/main/lib/component/FocusManager.js
View file

@ -71,8 +71,6 @@ Common.UI.FocusManager = new(function() {
item.selector = '.radiobox'; item.selector = '.radiobox';
else if (field instanceof Common.UI.TreeView) else if (field instanceof Common.UI.TreeView)
item.selector = '.treeview'; item.selector = '.treeview';
else if (field instanceof Common.UI.ColorButton)
item.selector = '.btn-group';
else if (field instanceof Common.UI.Button) else if (field instanceof Common.UI.Button)
item.selector = 'button'; item.selector = 'button';
else else

6
apps/common/main/resources/less/buttons.less
View file

@ -679,11 +679,9 @@
.caret { .caret {
} }
} }
}
.btn-group { &:not(.disabled) {
&:focus, &:active, &.open { &:focus, .btn-group.open &, .btn-group:active & {
.btn-color:not(.disabled) {
border-color: @border-control-focus-ie; border-color: @border-control-focus-ie;
border-color: @border-control-focus; border-color: @border-control-focus;
} }

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

@ -379,6 +379,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
color: 'auto', color: 'auto',
auto: true, auto: true,
cls: 'move-focus',
takeFocusOnClose: true takeFocusOnClose: true
}); });
this.colorsBorder = this.btnBorderColor.getPicker(); this.colorsBorder = this.btnBorderColor.getPicker();
@ -423,6 +424,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
parentEl: $('#paragraphadv-back-color-btn'), parentEl: $('#paragraphadv-back-color-btn'),
transparent: true, transparent: true,
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
cls: 'move-focus',
takeFocusOnClose: true takeFocusOnClose: true
}); });
this.colorsBack = this.btnBackColor.getPicker(); this.colorsBack = this.btnBackColor.getPicker();