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

Fix/fix bugs

apps/common/main/lib/template/SearchPanel.template

@@ -17,16 +17,16 @@
                         <label id="search-adv-results-number" style="display: inline-block;">
                             <%= scope.textSearchResults %>
                         </label>
-                        <div class="search-nav-btns" style="display: inline-block; float: right;">
+                        <div class="search-nav-btns">
-                            <div id="search-adv-back" style="display: inline-block; margin-right: 4px;"></div>
+                            <div id="search-adv-back"></div>
-                            <div id="search-adv-next" style="display: inline-block;"></div>
+                            <div id="search-adv-next"></div>
                         </div>
                     </td>
                 </tr>
                 <tr class="edit-setting">
                     <td class="padding-large">
-                       <button type="button" class="btn btn-text-default" id="search-adv-replace" style="display: inline-block; min-width: 62px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplace %></button>
-                       <button type="button" class="btn btn-text-default" id="search-adv-replace-all" style="display: inline-block; min-width: 78px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
+                       <button type="button" class="btn btn-text-default" id="search-adv-replace-all" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textReplaceAll %></button>
                     </td>
                 </tr>
                 <tr class="search-options-block">

apps/common/main/resources/less/searchdialog.less

@@ -160,6 +160,30 @@
             color: @text-secondary-ie;
             color: @text-secondary;
         }
+
+        .search-nav-btns {
+            display: inline-block;
+            float: right;
+            div {
+                display: inline-block;
+            }
+            #search-adv-back {
+                margin-right: 4px;
+            }
+        }
+
+        .btn-text-default {
+            display: inline-block;
+            width: auto;
+        }
+
+        #search-adv-replace {
+            min-width: 62px;
+        }
+
+        #search-adv-replace-all {
+            min-width: 78px;
+        }
     }
 
     .search-options-block {

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

@@ -444,6 +444,10 @@ define([
             }
         },
 
+        getSearchText: function () {
+            return this._state.searchText;
+        },
+
         notcriticalErrorTitle: 'Warning',
         warnReplaceString: '{0} is not a valid special character for the Replace With box.',
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',

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

@@ -293,7 +293,8 @@ define([
                 }, this));
             }
             if (this.header.btnSearch.pressed) {
-                this.searchBar.show(this.api.asc_GetSelectedText());
+                var selectedText = this.api.asc_GetSelectedText();
+                this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
             } else {
                 this.searchBar.hide();
             }

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -1381,7 +1381,7 @@ define([
             this.lblApplication = $markup.findById('#id-info-appname');
             this.tblAuthor = $markup.findById('#id-info-author table');
             this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
-            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}"></div><div class="tool close img-commonctrl" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
+            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}"></div><div class="tool close img-commonctrl img-colored" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
 
             this.tblAuthor.on('click', function(e) {
                 var btn = $markup.find(e.target);

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

@@ -397,6 +397,10 @@ define([
             }
         },
 
+        getSearchText: function () {
+            return this._state.searchText;
+        },
+
         notcriticalErrorTitle: 'Warning',
         warnReplaceString: '{0} is not a valid special character for the Replace With box.',
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',

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

@@ -355,7 +355,8 @@ define([
                 }, this));
             }
             if (this.header.btnSearch.pressed) {
-                this.searchBar.show(this.api.asc_GetSelectedText());
+                var selectedText = this.api.asc_GetSelectedText();
+                this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
             } else {
                 this.searchBar.hide();
             }

apps/presentationeditor/main/app/view/FileMenuPanels.js

@@ -1090,7 +1090,7 @@ define([
             this.lblApplication = $markup.findById('#id-info-appname');
             this.tblAuthor = $markup.findById('#id-info-author table');
             this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
-            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}" ></div><div class="tool close img-commonctrl" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
+            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}" ></div><div class="tool close img-commonctrl img-colored" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
 
             this.tblAuthor.on('click', function(e) {
                 var btn = $markup.find(e.target);

apps/spreadsheeteditor/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)
@@ -559,6 +565,10 @@ define([
             }
         },
 
+        getSearchText: function () {
+            return this._state.searchText;
+        },
+
         textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
         textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
         textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',

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

@@ -321,7 +321,8 @@ define([
                 }, this));
             }
             if (this.header.btnSearch.pressed) {
-                this.searchBar.show(this.api.asc_GetSelectedText());
+                var selectedText = this.api.asc_GetSelectedText();
+                this.searchBar.show(selectedText && selectedText.trim() || this.getApplication().getController('Search').getSearchText());
             } else {
                 this.searchBar.hide();
             }

apps/spreadsheeteditor/main/app/view/FileMenuPanels.js

@@ -1465,7 +1465,7 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
             this.lblApplication = $markup.findById('#id-info-appname');
             this.tblAuthor = $markup.findById('#id-info-author table');
             this.trAuthor = $markup.findById('#id-info-add-author').closest('tr');
-            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}" ></div><div class="tool close img-commonctrl" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
+            this.authorTpl = '<tr><td><div style="display: inline-block;width: 200px;"><input type="text" spellcheck="false" class="form-control" readonly="true" value="{0}" ></div><div class="tool close img-commonctrl img-colored" data-hint="2" data-hint-direction="right" data-hint-offset="small"></div></td></tr>';
 
             this.tblAuthor.on('click', function(e) {
                 var btn = $markup.find(e.target);