Merge pull request #1840 from ONLYOFFICE/fix/fix-bugs

Fix/fix bugs

apps/common/main/lib/component/MenuItem.js

@@ -301,6 +301,7 @@ define([
         },
 
         onItemMouseDown: function(e) {
+            Common.UI.HintManager.clearHints();
             if (e.which != 1) {
                 e.preventDefault();
                 e.stopPropagation();

apps/common/main/lib/view/SearchBar.js

@@ -139,6 +139,7 @@ define([
                 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);
 
+            this.disableNavButtons();
             if (text) {
                 this.inputSearch.val(text);
                 this.fireEvent('search:input', [text]);
@@ -146,7 +147,6 @@ define([
                 this.inputSearch.val('');
             }
 
-            this.disableNavButtons();
             this.focus();
         },
 
@@ -185,9 +185,9 @@ define([
         },
 
         disableNavButtons: function (resultNumber, allResults) {
-            var disable = this.inputSearch.val() === '';
+            var disable = this.inputSearch.val() === '' || !allResults;
-            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnBack.setDisabled(disable);
-            this.btnNext.setDisabled(disable || resultNumber + 1 === allResults);
+            this.btnNext.setDisabled(disable);
         },
 
         textFind: 'Find',

apps/common/main/lib/view/SearchPanel.js

@@ -373,9 +373,9 @@ define([
         },
 
         disableNavButtons: function (resultNumber, allResults) {
-            var disable = this.inputText._input.val() === '';
+            var disable = this.inputText._input.val() === '' || !allResults;
-            this.btnBack.setDisabled(disable || !allResults || resultNumber === 0);
+            this.btnBack.setDisabled(disable);
-            this.btnNext.setDisabled(disable || !allResults || resultNumber + 1 === allResults);
+            this.btnNext.setDisabled(disable);
         },
 
         disableReplaceButtons: function (disable) {

apps/documenteditor/main/app/controller/Search.js

@@ -57,7 +57,13 @@ define([
                 'SearchBar': {
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
                     'search:next': _.bind(this.onSearchNext, this, 'next'),
-                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:input': _.bind(function (text) {
+                        if (this._state.searchText === text) {
+                            Common.NotificationCenter.trigger('search:updateresults', this._state.currentResult, this._state.resultsNumber);
+                            return;
+                        }
+                        this.onInputSearchChange(text);
+                    }, this),
                     'search:keydown': _.bind(this.onSearchNext, this, 'keydown'),
                     'show': _.bind(this.onSelectSearchingResults, this, true),
                     'hide': _.bind(this.onSelectSearchingResults, this, false)
@@ -169,6 +175,7 @@ define([
                             me.view.disableReplaceButtons(false);
                         } else if (me._state.newSearchText === '') {
                             me.view.updateResultsNumber('no-results');
+                            me.view.disableNavButtons();
                             me.view.disableReplaceButtons(true);
                         }
                         clearInterval(me.searchTimer);

apps/presentationeditor/main/app/controller/Search.js

@@ -57,7 +57,13 @@ define([
                 'SearchBar': {
                     'search:back': _.bind(this.onSearchNext, this, 'back'),
                     'search:next': _.bind(this.onSearchNext, this, 'next'),
-                    'search:input': _.bind(this.onInputSearchChange, this),
+                    'search:input': _.bind(function (text) {
+                        if (this._state.searchText === text) {
+                            Common.NotificationCenter.trigger('search:updateresults', this._state.currentResult, this._state.resultsNumber);
+                            return;
+                        }
+                        this.onInputSearchChange(text);
+                    }, this),
                     'search:keydown': _.bind(this.onSearchNext, this, 'keydown')
                 },
                 'Common.Views.SearchPanel': {
@@ -166,6 +172,7 @@ define([
                             me.view.disableReplaceButtons(false);
                         } else if (me._state.newSearchText === '') {
                             me.view.updateResultsNumber('no-results');
+                            me.view.disableNavButtons();
                             me.view.disableReplaceButtons(true);
                         }
                         clearInterval(me.searchTimer);

apps/presentationeditor/main/locale/en.json

@@ -556,6 +556,7 @@
   "Common.Views.SearchPanel.textWholeWords": "Whole words only",
   "Common.Views.SearchPanel.tipNextResult": "Next result",
   "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.textSearchHasStopped": "Search has stopped",
   "Common.Views.SelectFileDlg.textLoading": "Loading",
   "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
   "Common.Views.SignDialog.textBold": "Bold",

apps/spreadsheeteditor/main/app/controller/Search.js

@@ -229,6 +229,7 @@ define([
                             //me.view.disableReplaceButtons(false);
                         } else if (me._state.newSearchText === '') {
                             me.view.updateResultsNumber('no-results');
+                            me.view.disableNavButtons();
                             //me.view.disableReplaceButtons(true);
                         }
                         clearInterval(me.searchTimer);

apps/spreadsheeteditor/main/locale/en.json

@@ -421,6 +421,7 @@
   "Common.Views.SearchPanel.textWorkbook": "Workbook",
   "Common.Views.SearchPanel.tipNextResult": "Next result",
   "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
+  "Common.Views.SearchPanel.textSearchHasStopped": "Search has stopped",
   "Common.Views.SelectFileDlg.textLoading": "Loading",
   "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
   "Common.Views.SignDialog.textBold": "Bold",