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

[DE PE SSE] Fix ability to navigate through search results by enter key

Browse source
This commit is contained in:
JuliaSvinareva 2022-07-21 20:44:48 +03:00
parent e35f9f70b2
commit e27d11189e
5 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/view/SearchBar.js
View file

@ -198,13 +198,15 @@ define([
var elFocus = this.getChild().find(':focus'), var elFocus = this.getChild().find(':focus'),
action = elFocus.prop('id') === 'search-bar-next' ? 'next' : 'back'; action = elFocus.prop('id') === 'search-bar-next' ? 'next' : 'back';
elFocus.find('button')[e.keyCode === Common.UI.Keys.RETURN ? 'addClass' : 'removeClass']('focused'); elFocus.find('button')[e.keyCode === Common.UI.Keys.RETURN ? 'addClass' : 'removeClass']('focused');
if (e.keyCode === Common.UI.Keys.RETURN) {
this.fireEvent('search:keydown-next', [action, this.inputSearch.val(), e]); this.fireEvent('search:keydown-next', [action, this.inputSearch.val(), e]);
if (e.keyCode !== Common.UI.Keys.RETURN) { } else {
this.onMousedown(); this.onMousedown();
} }
}, },
onMousedown: function () { onMousedown: function () {
this.fireEvent('search:enable-key');
this.getChild().find('.focused').removeClass('focused'); this.getChild().find('.focused').removeClass('focused');
$(document).off('keydown', this.wrapEvents.keydown); $(document).off('keydown', this.wrapEvents.keydown);
$(document).off('mousedown', this.wrapEvents.mousedown); $(document).off('mousedown', this.wrapEvents.mousedown);

4
apps/common/main/lib/view/SearchPanel.js
View file

@ -369,13 +369,15 @@ define([
var elFocus = $(':focus'), var elFocus = $(':focus'),
action = elFocus.prop('id') === 'search-adv-next' ? 'next' : 'back'; action = elFocus.prop('id') === 'search-adv-next' ? 'next' : 'back';
elFocus.find('button')[e.keyCode === Common.UI.Keys.RETURN ? 'addClass' : 'removeClass']('focused'); elFocus.find('button')[e.keyCode === Common.UI.Keys.RETURN ? 'addClass' : 'removeClass']('focused');
if (e.keyCode === Common.UI.Keys.RETURN) {
this.fireEvent('search:keydown-next', [action, this.inputText.getValue(), e]); this.fireEvent('search:keydown-next', [action, this.inputText.getValue(), e]);
if (e.keyCode !== Common.UI.Keys.RETURN) { } else {
this.onMousedown(); this.onMousedown();
} }
}, },
onMousedown: function () { onMousedown: function () {
this.fireEvent('search:enable-key');
this.$el.find('.focused').removeClass('focused'); this.$el.find('.focused').removeClass('focused');
$(document).off('keydown', this.wrapEvents.keydown); $(document).off('keydown', this.wrapEvents.keydown);
$(document).off('mousedown', this.wrapEvents.mousedown); $(document).off('mousedown', this.wrapEvents.mousedown);

12
apps/documenteditor/main/app/controller/Search.js
View file

@ -67,7 +67,8 @@ define([
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onSelectSearchingResults, this, true), 'show': _.bind(this.onSelectSearchingResults, this, true),
'hide': _.bind(this.onSelectSearchingResults, this, false), 'hide': _.bind(this.onSelectSearchingResults, this, false),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'Common.Views.SearchPanel': { 'Common.Views.SearchPanel': {
'search:back': _.bind(this.onSearchNext, this, 'back'), 'search:back': _.bind(this.onSearchNext, this, 'back'),
@ -79,7 +80,8 @@ define([
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onShowPanel, this), 'show': _.bind(this.onShowPanel, this),
'hide': _.bind(this.onHidePanel, this), 'hide': _.bind(this.onHidePanel, this),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'LeftMenu': { 'LeftMenu': {
'search:aftershow': _.bind(this.onShowAfterSearch, this) 'search:aftershow': _.bind(this.onShowAfterSearch, this)
@ -164,7 +166,11 @@ define([
}, },
onKeydownNext: function (type, text, e) { onKeydownNext: function (type, text, e) {
e.keyCode === Common.UI.Keys.RETURN ? this.onSearchNext(type, text, e) : this.api.asc_enableKeyEvents(true); this.onSearchNext(type, text, e);
},
enableKeyEvents: function () {
this.api.asc_enableKeyEvents(true);
}, },
onInputSearchChange: function (text) { onInputSearchChange: function (text) {

12
apps/presentationeditor/main/app/controller/Search.js
View file

@ -65,7 +65,8 @@ define([
this.onInputSearchChange(text); this.onInputSearchChange(text);
}, this), }, this),
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'Common.Views.SearchPanel': { 'Common.Views.SearchPanel': {
'search:back': _.bind(this.onSearchNext, this, 'back'), 'search:back': _.bind(this.onSearchNext, this, 'back'),
@ -77,7 +78,8 @@ define([
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onShowPanel, this), 'show': _.bind(this.onShowPanel, this),
'hide': _.bind(this.onHidePanel, this), 'hide': _.bind(this.onHidePanel, this),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'LeftMenu': { 'LeftMenu': {
'search:aftershow': _.bind(this.onShowAfterSearch, this) 'search:aftershow': _.bind(this.onShowAfterSearch, this)
@ -161,7 +163,11 @@ define([
}, },
onKeydownNext: function (type, text, e) { onKeydownNext: function (type, text, e) {
e.keyCode === Common.UI.Keys.RETURN ? this.onSearchNext(type, text, e) : this.api.asc_enableKeyEvents(true); this.onSearchNext(type, text, e);
},
enableKeyEvents: function () {
this.api.asc_enableKeyEvents(true);
}, },
onInputSearchChange: function (text) { onInputSearchChange: function (text) {

12
apps/spreadsheeteditor/main/app/controller/Search.js
View file

@ -61,7 +61,8 @@ define([
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onSelectSearchingResults, this, true), 'show': _.bind(this.onSelectSearchingResults, this, true),
'hide': _.bind(this.onSelectSearchingResults, this, false), 'hide': _.bind(this.onSelectSearchingResults, this, false),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'Common.Views.SearchPanel': { 'Common.Views.SearchPanel': {
'search:back': _.bind(this.onSearchNext, this, 'back'), 'search:back': _.bind(this.onSearchNext, this, 'back'),
@ -73,7 +74,8 @@ define([
'search:keydown': _.bind(this.onSearchNext, this, 'keydown'), 'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
'show': _.bind(this.onShowPanel, this), 'show': _.bind(this.onShowPanel, this),
'hide': _.bind(this.onHidePanel, this), 'hide': _.bind(this.onHidePanel, this),
'search:keydown-next': _.bind(this.onKeydownNext, this) 'search:keydown-next': _.bind(this.onKeydownNext, this),
'search:enable-key': _.bind(this.enableKeyEvents, this)
}, },
'LeftMenu': { // TO DO 'LeftMenu': { // TO DO
'search:aftershow': _.bind(this.onShowAfterSearch, this) 'search:aftershow': _.bind(this.onShowAfterSearch, this)
@ -218,7 +220,11 @@ define([
}, },
onKeydownNext: function (type, text, e) { onKeydownNext: function (type, text, e) {
e.keyCode === Common.UI.Keys.RETURN ? this.onSearchNext(type, text, e) : this.api.asc_enableKeyEvents(true); this.onSearchNext(type, text, e);
},
enableKeyEvents: function () {
this.api.asc_enableKeyEvents(true);
}, },
onInputSearchChange: function (text) { onInputSearchChange: function (text) {