Merge pull request #26 from ONLYOFFICE/release/v4.1.0

[DE][SSE] Update zoom value in the toolbar menu when editor is loading.

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

@@ -765,7 +765,7 @@ define([
         onApiZoomChange: function(percent, type) {
             this.toolbar.btnFitPage.setChecked(type == 2, true);
             this.toolbar.btnFitWidth.setChecked(type == 1, true);
-
+            this.toolbar.mnuZoom.options.value = percent;
             $('.menu-zoom .zoom', this.toolbar.el).html(percent + '%');
         },
 

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

@@ -748,6 +748,7 @@ define([
                 isChecked: function () { return this.conf.checked; }
             };
             this.btnFitWidth = _.clone(this.btnFitPage);
+            this.mnuZoom = {options: {value: 100}};
 
             this.btnAdvSettings = new Common.UI.Button({
                 id          : 'id-toolbar-btn-settings',
@@ -1169,7 +1170,7 @@ define([
                             checkable: true,
                             checked: this.btnFitWidth.isChecked()
                         }),
-                        (new Common.UI.MenuItem({
+                        this.mnuZoom = new Common.UI.MenuItem({
                             template: _.template([
                                 '<div id="id-toolbar-menu-zoom" class="menu-zoom" style="height: 25px;" ',
                                 '<% if(!_.isUndefined(options.stopPropagation)) { %>',
@@ -1177,12 +1178,13 @@ define([
                                 '<% } %>', '>',
                                 '<label class="title">' + this.textZoom + '</label>',
                                 '<button id="id-menu-zoom-in" type="button" style="float:right; margin: 2px 5px 0 0;" class="btn small btn-toolbar"><span class="btn-icon btn-zoomin">&nbsp;</span></button>',
-                                '<label class="zoom">100%</label>',
+                                '<label class="zoom"><%= options.value %>%</label>',
                                 '<button id="id-menu-zoom-out" type="button" style="float:right; margin-top: 2px;" class="btn small btn-toolbar"><span class="btn-icon btn-zoomout">&nbsp;</span></button>',
                                 '</div>'
                             ].join('')),
-                            stopPropagation: true
-                        }))
+                            stopPropagation: true,
+                            value: this.mnuZoom.options.value
+                        })
                     ]
                 })
             );

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

@@ -270,6 +270,7 @@ define([
             this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this));
             Common.NotificationCenter.on('api:disconnect',              _.bind(this.onApiCoAuthoringDisconnect, this));
             this.api.asc_registerCallback('asc_onLockDefNameManager',   _.bind(this.onLockDefNameManager, this));
+            this.api.asc_registerCallback('asc_onZoomChanged',          _.bind(this.onApiZoomChange, this));
         },
 
         onNewDocument: function(btn, e) {
@@ -1156,7 +1157,6 @@ define([
             this.api.asc_registerCallback('asc_onCanRedoChanged',           _.bind(this.onApiCanRevert, this, 'redo'));
             this.api.asc_registerCallback('asc_onEditCell',                 _.bind(this.onApiEditCell, this));
             this.api.asc_registerCallback('asc_onEndAddShape',              _.bind(this.onApiEndAddShape, this));
-            this.api.asc_registerCallback('asc_onZoomChanged',              _.bind(this.onApiZoomChange, this));
             this.api.asc_registerCallback('asc_onSheetsChanged',            _.bind(this.onApiSheetChanged, this));
             this.api.asc_registerCallback('asc_onStopFormatPainter',        _.bind(this.onApiStyleChange, this));
             this.api.asc_registerCallback('asc_onUpdateSheetViewSettings',  _.bind(this.onApiSheetChanged, this));