diff --git a/apps/common/main/lib/view/SearchPanel.js b/apps/common/main/lib/view/SearchPanel.js index 11dc0ebdb..cb43db898 100644 --- a/apps/common/main/lib/view/SearchPanel.js +++ b/apps/common/main/lib/view/SearchPanel.js @@ -210,6 +210,7 @@ define([ }).on('keyup:after', function(input, e) { me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]); }); + this.inputSelectRange.$el.hide(); this.cmbSearch = new Common.UI.ComboBox({ el: $('#search-adv-cmb-search'), @@ -437,8 +438,8 @@ define([ textValue: 'Value', textFormula: 'Formula', textSearchHasStopped: 'Search has stopped', - textContentChanged: 'Document content has changed.', - textSearchAgain: '{0}Search again{1} to make sure the results are current.' + textContentChanged: 'Document changed.', + textSearchAgain: '{0}Perform new search{1} for accurate results.' }, Common.Views.SearchPanel || {})); }); \ No newline at end of file diff --git a/apps/spreadsheeteditor/main/app/controller/Search.js b/apps/spreadsheeteditor/main/app/controller/Search.js index c77f3a956..534684f04 100644 --- a/apps/spreadsheeteditor/main/app/controller/Search.js +++ b/apps/spreadsheeteditor/main/app/controller/Search.js @@ -155,6 +155,8 @@ define([ if (value === Asc.c_oAscSearchBy.Range) { runSearch = this._state.isValidSelectedRange && !!this._state.selectedRange; } + this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide'](); + this.view.updateResultsContainerHeight(); break; case 'range': this._state.selectedRange = value; diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 11f8a3328..930e87b49 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -423,8 +423,8 @@ "Common.Views.SearchPanel.textWorkbook": "Workbook", "Common.Views.SearchPanel.tipNextResult": "Next result", "Common.Views.SearchPanel.tipPreviousResult": "Previous result", - "Common.Views.SearchPanel.textContentChanged": "Document content has changed.", - "Common.Views.SearchPanel.textSearchAgain": "{0}Search again{1} to make sure the results are current.", + "Common.Views.SearchPanel.textContentChanged": "Document changed.", + "Common.Views.SearchPanel.textSearchAgain": "{0}Perform new search{1} for accurate results.", "Common.Views.SelectFileDlg.textLoading": "Loading", "Common.Views.SelectFileDlg.textTitle": "Select Data Source", "Common.Views.SignDialog.textBold": "Bold", diff --git a/apps/spreadsheeteditor/main/resources/less/leftmenu.less b/apps/spreadsheeteditor/main/resources/less/leftmenu.less index 7f4accae5..b705dfc6d 100644 --- a/apps/spreadsheeteditor/main/resources/less/leftmenu.less +++ b/apps/spreadsheeteditor/main/resources/less/leftmenu.less @@ -772,7 +772,7 @@ } } .search-items { - height: calc(100% - 24px); + height: calc(100% - 28px); position: absolute; top: 28px; width: 100%;