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

[DE] Bug 54255

Browse source
This commit is contained in:
JuliaSvinareva 2022-07-08 21:33:54 +03:00
parent e045c0f41c
commit 1422b8f772
5 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -164,7 +164,7 @@ define([
}, },
template: _.template([ template: _.template([
'<div class="treeview inner" style="<%= style %>"></div>' '<div class="treeview inner" style="<%= style %>" tabindex="0" data-hint="<%= options.dataHint %>" data-hint-direction="top" data-hint-offset="100,0"></div>'
].join('')), ].join('')),
initialize : function(options) { initialize : function(options) {

7
apps/common/main/lib/controller/HintManager.js
View file

@ -543,6 +543,13 @@ Common.UI.HintManager = new(function() {
_hideHints(); _hideHints();
curr.focus(); curr.focus();
_resetToDefault(); _resetToDefault();
} else if (curr.hasClass('treeview')) {
_hideHints();
_resetToDefault();
curr.trigger('hint:focus');
setTimeout(function () {
curr.focus();
}, 10);
} else { } else {
_isComplete = false; _isComplete = false;
_hideHints(); _hideHints();

6
apps/documenteditor/main/app/controller/Navigation.js
View file

@ -110,6 +110,12 @@ define([
}, },
onAfterRender: function(panelNavigation) { onAfterRender: function(panelNavigation) {
panelNavigation.viewNavigationList.cmpEl.on('hint:focus', '.treeview', _.bind(function (e) {
this.api.asc_enableKeyEvents(false);
$(e.currentTarget).on('keydown', _.bind(function (e) {
console.log('keydown');
}, this));
}, this));
panelNavigation.viewNavigationList.on('item:click', _.bind(this.onSelectItem, this)); panelNavigation.viewNavigationList.on('item:click', _.bind(this.onSelectItem, this));
panelNavigation.viewNavigationList.on('item:contextmenu', _.bind(this.onItemContextMenu, this)); panelNavigation.viewNavigationList.on('item:contextmenu', _.bind(this.onItemContextMenu, this));
panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this)); panelNavigation.viewNavigationList.on('item:add', _.bind(this.onItemAdd, this));

2
apps/documenteditor/main/app/template/LeftMenu.template
View file

@ -6,7 +6,7 @@
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button> <button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ --> <!-- /** coauthoring end **/ -->
<button id="left-btn-plugins" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button> <button id="left-btn-plugins" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-plugin">&nbsp;</i></button>
<button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="" data-layout-name="leftMenu-navigation"><i class="icon toolbar__icon btn-menu-navigation">&nbsp;</i></button> <button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-navigation" data-layout-name="leftMenu-navigation"><i class="icon toolbar__icon btn-menu-navigation">&nbsp;</i></button>
<button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button> <button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button> <button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button> <button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>

9
apps/documenteditor/main/app/view/Navigation.js
View file

@ -77,6 +77,8 @@ define([
cls: 'btn-toolbar', cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-close', iconCls: 'toolbar__icon btn-close',
hint: this.txtClosePanel, hint: this.txtClosePanel,
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnSettings = new Common.UI.Button({ this.btnSettings = new Common.UI.Button({
@ -155,7 +157,9 @@ define([
value: 'wrap' value: 'wrap'
} }
] ]
}) }),
dataHint: '1',
dataHintDirection: 'bottom'
}); });
this.btnSettingsMenu = this.btnSettings.menu; this.btnSettingsMenu = this.btnSettings.menu;
@ -167,7 +171,8 @@ define([
emptyItemText: this.txtEmptyItem, emptyItemText: this.txtEmptyItem,
style: 'border: none;', style: 'border: none;',
delayRenderTips: true, delayRenderTips: true,
minScrollbarLength: 25 minScrollbarLength: 25,
dataHint: '1'
}); });
this.viewNavigationList.cmpEl.off('click'); this.viewNavigationList.cmpEl.off('click');