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

[DE PE SSE] New search: add filling find input, fix view mode

Browse source
This commit is contained in:
JuliaSvinareva 2022-03-02 21:48:37 +03:00
parent 2ac854edc4
commit 2bfe6b2d2c
8 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -118,9 +118,10 @@ define([
show: function() { show: function() {
var top = $('#app-title').height() + $('#toolbar').height() + 2, var top = $('#app-title').height() + $('#toolbar').height() + 2,
left = Common.Utils.innerWidth() - $('#right-menu').width() - this.options.width - 32; left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32;
Common.UI.Window.prototype.show.call(this, left, top); Common.UI.Window.prototype.show.call(this, left, top);
this.inputSearch.val('');
this.focus(); this.focus();
}, },
@ -154,7 +155,7 @@ define([
onOpenPanel: function () { onOpenPanel: function () {
this.hide(); this.hide();
this.fireEvent('search:show', [true]); this.fireEvent('search:show', [true, this.inputSearch.val()]);
}, },
textFind: 'Find' textFind: 'Find'

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

@ -271,6 +271,10 @@ define([
Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions); Common.localStorage.setBool('sse-search-options-extended', this.extendedOptions);
}, },
setFindText: function (val) {
this.inputText.setValue(val);
},
textFind: 'Find', textFind: 'Find',
textFindAndReplace: 'Find and replace', textFindAndReplace: 'Find and replace',
textCloseSearch: 'Close search', textCloseSearch: 'Close search',

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

@ -921,10 +921,11 @@ define([
} }
}, },
onShowHideSearch: function (state, action) { onShowHideSearch: function (state, findText, action) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
findText && this.leftMenu.panelSearch.setFindText(findText);
this.leftMenu.panelSearch.setSearchMode(mode); this.leftMenu.panelSearch.setSearchMode(mode);
this.leftMenu.showMenu('advancedsearch'); this.leftMenu.showMenu('advancedsearch');
} else { } else {

2
apps/documenteditor/main/app/controller/Viewport.js
View file

@ -333,13 +333,13 @@ define([
cls : 'btn-toolbar' cls : 'btn-toolbar'
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this)); me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
if ( !Common.UI.Themes.isDarkTheme() ) { if ( !Common.UI.Themes.isDarkTheme() ) {
me.header.menuItemsDarkMode.hide(); me.header.menuItemsDarkMode.hide();
me.header.menuItemsDarkMode.$el.prev('.divider').hide(); me.header.menuItemsDarkMode.$el.prev('.divider').hide();
} }
} }
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
}, },
onLayoutChanged: function(area) { onLayoutChanged: function(area) {

3
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -774,10 +774,11 @@ define([
} }
}, },
onShowHideSearch: function (state, action) { onShowHideSearch: function (state, findText, action) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
findText && this.leftMenu.panelSearch.setFindText(findText);
this.leftMenu.panelSearch.setSearchMode(mode); this.leftMenu.panelSearch.setSearchMode(mode);
this.leftMenu.showMenu('advancedsearch'); this.leftMenu.showMenu('advancedsearch');
} else { } else {

2
apps/presentationeditor/main/app/controller/Viewport.js
View file

@ -342,8 +342,8 @@ define([
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this)); me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
} }
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
}, },
onLayoutChanged: function(area) { onLayoutChanged: function(area) {

3
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -983,10 +983,11 @@ define([
} }
}, },
onShowHideSearch: function (state, action) { onShowHideSearch: function (state, findText, action) {
if (state) { if (state) {
Common.UI.Menu.Manager.hideAll(); Common.UI.Menu.Manager.hideAll();
var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace'; var mode = this.mode.isEdit && !this.viewmode ? (action || undefined) : 'no-replace';
findText && this.leftMenu.panelSearch.setFindText(findText);
this.leftMenu.panelSearch.setSearchMode(mode); this.leftMenu.panelSearch.setSearchMode(mode);
this.leftMenu.showMenu('advancedsearch'); this.leftMenu.showMenu('advancedsearch');
} else { } else {

2
apps/spreadsheeteditor/main/app/controller/Viewport.js
View file

@ -348,8 +348,8 @@ define([
})).on('click', _on_btn_zoom.bind(me, 'up')); })).on('click', _on_btn_zoom.bind(me, 'up'));
me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this)); me.header.btnOptions.menu.on('item:click', me.onOptionsItemClick.bind(this));
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
} }
me.header.btnSearch.on('click', me.onSearchClick.bind(this));
}, },
// When our application is ready, lets get started // When our application is ready, lets get started