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

Fix/fix bugs

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

@@ -407,9 +407,7 @@ define([
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
                     me.view.$resultsContainer.append(item.el);
-                    if (item.selected) {
+                    $(item.el)[item.selected ? 'addClass' : 'removeClass']('selected');
-                        $(item.el).addClass('selected');
-                    }
                     $(item.el).on('click', function (el) {
                         me.api.asc_SelectSearchElement(item.id);
                         $('#search-results').find('.item').removeClass('selected');

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

@@ -248,6 +248,7 @@ define([
                 this.lockedControls.push(this.chRulers);
 
                 Common.Utils.lockControls(_set.disableOnStart, true, {array: this.lockedControls});
+                Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
 
             render: function (el) {
@@ -273,6 +274,14 @@ define([
                 return this.$el;
             },
 
+            onAppReady: function () {
+                this.btnNavigation.updateHint(this.tipHeadings);
+                this.btnFitToPage.updateHint(this.tipFitToPage);
+                this.btnFitToWidth.updateHint(this.tipFitToWidth);
+                this.btnInterfaceTheme.updateHint(this.tipInterfaceTheme);
+                this.btnDarkDocument.updateHint(this.tipDarkDocument);
+            },
+
             show: function () {
                 Common.UI.BaseView.prototype.show.call(this);
                 this.fireEvent('show', this);
@@ -313,7 +322,12 @@ define([
             textStatusBar: 'Status Bar',
             textAlwaysShowToolbar: 'Always show toolbar',
             textRulers: 'Rulers',
-            textDarkDocument: 'Dark document'
+            textDarkDocument: 'Dark document',
+            tipHeadings: 'Headings',
+            tipFitToPage: 'Fit to page',
+            tipFitToWidth: 'Fit to width',
+            tipInterfaceTheme: 'Interface theme',
+            tipDarkDocument: 'Dark document'
         }
     }()), DE.Views.ViewTab || {}));
 });

apps/documenteditor/main/locale/en.json

@@ -2918,6 +2918,11 @@
   "DE.Views.ViewTab.textRulers": "Rulers",
   "DE.Views.ViewTab.textStatusBar": "Status Bar",
   "DE.Views.ViewTab.textZoom": "Zoom",
+  "DE.Views.ViewTab.tipHeadings": "Headings",
+  "DE.Views.ViewTab.tipFitToPage": "Fit to page",
+  "DE.Views.ViewTab.tipFitToWidth": "Fit to width",
+  "DE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
+  "DE.Views.ViewTab.tipDarkDocument": "Dark document",
   "DE.Views.WatermarkSettingsDialog.textAuto": "Auto",
   "DE.Views.WatermarkSettingsDialog.textBold": "Bold",
   "DE.Views.WatermarkSettingsDialog.textColor": "Text color",

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

@@ -366,9 +366,7 @@ define([
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
                     me.view.$resultsContainer.append(item.el);
-                    if (item.selected) {
+                    $(item.el)[item.selected ? 'addClass' : 'removeClass']('selected');
-                        $(item.el).addClass('selected');
-                    }
                     $(item.el).on('click', function (el) {
                         me.api.asc_SelectSearchElement(item.id);
                         $('#search-results').find('.item').removeClass('selected');

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

@@ -225,6 +225,8 @@ define([
                     dataHintOffset: 'small'
                 });
                 this.lockedControls.push(this.chNotes);
+
+                Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
             },
 
             render: function (el) {
@@ -249,6 +251,12 @@ define([
                 return this.$el;
             },
 
+            onAppReady: function () {
+                this.btnFitToSlide.updateHint(this.tipFitToSlide);
+                this.btnFitToWidth.updateHint(this.tipFitToWidth);
+                this.btnInterfaceTheme.updateHint(this.tipInterfaceTheme);
+            },
+
             show: function () {
                 Common.UI.BaseView.prototype.show.call(this);
                 this.fireEvent('show', this);
@@ -283,7 +291,10 @@ define([
             textStatusBar: 'Status Bar',
             textAlwaysShowToolbar: 'Always show toolbar',
             textRulers: 'Rulers',
-            textNotes: 'Notes'
+            textNotes: 'Notes',
+            tipFitToSlide: 'Fit to slide',
+            tipFitToWidth: 'Fit to width',
+            tipInterfaceTheme: 'Interface theme'
         }
     }()), PE.Views.ViewTab || {}));
 });

apps/presentationeditor/main/locale/en.json

@@ -2368,5 +2368,8 @@
   "PE.Views.ViewTab.textNotes": "Notes",
   "PE.Views.ViewTab.textRulers": "Rulers",
   "PE.Views.ViewTab.textStatusBar": "Status Bar",
-  "PE.Views.ViewTab.textZoom": "Zoom"
+  "PE.Views.ViewTab.textZoom": "Zoom",
+  "PE.Views.ViewTab.tipFitToSlide": "Fit to slide",
+  "PE.Views.ViewTab.tipFitToWidth": "Fit to width",
+  "PE.Views.ViewTab.tipInterfaceTheme": "Interface theme"
 }

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

@@ -522,6 +522,7 @@ define([
                 this.view.$resultsContainer.show();
                 this.resultItems.forEach(function (item) {
                     var $item = $(item.el).appendTo($tableBody);
+                    item.$el = $item;
                     if (item.selected) {
                         $item.addClass('selected');
                     }

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

@@ -353,6 +353,8 @@ define([
                         me.btnCloseView.updateHint(me.tipClose);
                     }
 
+                    me.btnInterfaceTheme.updateHint(me.tipInterfaceTheme);
+
                     if (config.isEdit) {
                         me.btnFreezePanes.setMenu(new Common.UI.Menu({
                             items: [
@@ -528,7 +530,8 @@ define([
             textCombineSheetAndStatusBars: 'Combine sheet and status bars',
             textAlwaysShowToolbar: 'Always show toolbar',
             textInterfaceTheme: 'Interface theme',
-            textShowFrozenPanesShadow: 'Show frozen panes shadow'
+            textShowFrozenPanesShadow: 'Show frozen panes shadow',
+            tipInterfaceTheme: 'Interface theme'
         }
     }()), SSE.Views.ViewTab || {}));
 });

apps/spreadsheeteditor/main/locale/en.json

@@ -3679,6 +3679,7 @@
   "SSE.Views.ViewTab.tipCreate": "Create sheet view",
   "SSE.Views.ViewTab.tipFreeze": "Freeze panes",
   "SSE.Views.ViewTab.tipSheetView": "Sheet view",
+  "SSE.Views.ViewTab.tipInterfaceTheme": "Interface theme",
   "SSE.Views.WBProtection.hintAllowRanges": "Allow edit ranges",
   "SSE.Views.WBProtection.hintProtectSheet": "Protect sheet",
   "SSE.Views.WBProtection.hintProtectWB": "Protect workbook",