Merge pull request 'Fix btnTextDir subscription for “Diagram” and “OLE” modes' (#968) from fix/btnTextDir into release/v9.3.0

apps/documenteditor/forms/app/controller/ApplicationController.js

@@ -1739,10 +1739,30 @@ define([
         onMenuZoomClick: function(menu, item, e){
             switch ( item.value ) {
                 case 'zoom:page':
-                    item.isChecked() ? this.api.zoomFitToPage() : this.api.zoomCustomMode();
+                    if (item.isChecked()) {
+                        this.api.GetMultipageViewMode() && this.api.SetMultipageViewMode(false);
+                        this.api.zoomFitToPage();
+                        this.view.mnuZoom.items[2].setChecked(false);
+                    } else {
+                        this.api.zoomCustomMode();
+                    }
                     break;
                 case 'zoom:width':
-                    item.isChecked() ? this.api.zoomFitToWidth() : this.api.zoomCustomMode();
+                    if (item.isChecked()) {
+                        this.api.GetMultipageViewMode() && this.api.SetMultipageViewMode(false);
+                        this.api.zoomFitToWidth();
+                        this.view.mnuZoom.items[2].setChecked(false);
+                    } else {
+                        this.api.zoomCustomMode();
+                    }
+                    break;
+                case 'zoom:multi':
+                    if (item.isChecked()) {
+                        this.api.zoomCustomMode();
+                        this.api.SetMultipageViewMode(true);
+                    } else {
+                        this.api.SetMultipageViewMode(false);
+                    }
                     break;
             }
 

apps/documenteditor/forms/app/view/ApplicationView.js

@@ -76,6 +76,7 @@ define([
                                 items: [
                                     {caption: this.textFitToPage, value: 'zoom:page', toggleGroup: 'view-zoom', checkable: true},
                                     {caption: this.textFitToWidth, value: 'zoom:width', toggleGroup: 'view-zoom', checkable: true},
+                                    {caption: this.textMultiplePages, value: 'zoom:multi', checkable: true},
                                     (new Common.UI.MenuItem({
                                         template: _.template([
                                             '<div id="id-menu-zoom" class="menu-zoom" style="height: 26px;" ',

apps/documenteditor/forms/locale/en.json

@@ -186,6 +186,7 @@
   "DE.Views.ApplicationView.textCut": "Cut",
   "DE.Views.ApplicationView.textFitToPage": "Fit to page",
   "DE.Views.ApplicationView.textFitToWidth": "Fit to width",
+  "DE.Views.ApplicationView.textMultiplePages": "Multiple pages",
   "DE.Views.ApplicationView.textNext": "Next field",
   "DE.Views.ApplicationView.textPaste": "Paste",
   "DE.Views.ApplicationView.textPrintSel": "Print selection",

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

@@ -317,6 +317,8 @@ define([
                 if (toolbar.cmbNumberFormat.cmpEl)
                     toolbar.cmbNumberFormat.cmpEl.on('click', '#id-toolbar-mnu-item-more-formats a', _.bind(this.onNumberFormatSelect, this));
                 toolbar.btnEditChartData.on('click',                        _.bind(this.onEditChartData, this));
+                toolbar.btnTextDir.menu.on('item:click',                    _.bind(this.onTextDirClick, this));
+                toolbar.btnTextDir.menu.on('show:before',                    _.bind(this.onUpdateTextDir, this));
             } else
             if ( me.appConfig.isEditMailMerge ) {
                 toolbar.btnUndo.on('click',                                 _.bind(this.onUndo, this));
@@ -379,8 +381,6 @@ define([
                 toolbar.btnTextFormatting.menu.on('item:click',             _.bind(this.onTextFormattingMenu, this));
                 toolbar.btnHorizontalAlign.menu.on('item:click',            _.bind(this.onHorizontalAlignMenu, this));
                 toolbar.btnVerticalAlign.menu.on('item:click',              _.bind(this.onVerticalAlignMenu, this));
-            } else
-            if ( me.appConfig.isEditDiagram || me.appConfig.isEditOle ){
                 toolbar.btnTextDir.menu.on('item:click',                    _.bind(this.onTextDirClick, this));
                 toolbar.btnTextDir.menu.on('show:before',                    _.bind(this.onUpdateTextDir, this));
             } else {