diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index df5190faf..6eb83d204 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1298,7 +1298,7 @@ define([ Common.Gateway.setDocumentModified(change); if (this.toolbarView && this.toolbarView.btnSave && this.api) { - var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + var isSyncButton = $('.icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), forcesave = this.appOptions.forcesave; var cansave = this.api.asc_isDocumentCanSave(); if (this.toolbarView.btnSave.isDisabled() !== (!cansave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave)) @@ -1308,7 +1308,7 @@ define([ onDocumentCanSaveChanged: function (isCanSave) { if (this.toolbarView && this.toolbarView.btnSave) { - var isSyncButton = $('.btn-icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), + var isSyncButton = $('.icon', this.toolbarView.btnSave.cmpEl).hasClass('btn-synch'), forcesave = this.appOptions.forcesave; if (this.toolbarView.btnSave.isDisabled() !== (!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave)) this.toolbarView.btnSave.setDisabled(!isCanSave && !isSyncButton && !forcesave || this._state.isDisconnected || this._state.fastCoauth && this._state.usersCount>1 && !forcesave); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 18fa15c63..eee4703fd 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -331,7 +331,7 @@ define([ onSave: function(e) { if (this.api) { var isModified = this.api.asc_isDocumentCanSave(); - var isSyncButton = $('.btn-icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch'); + var isSyncButton = $('.icon', this.toolbar.btnSave.cmpEl).hasClass('btn-synch'); if (!isModified && !isSyncButton && !this.toolbar.mode.forcesave) return; @@ -506,7 +506,7 @@ define([ bordersColor = btnBorders.options.borderscolor; if (btnBorders.rendered) { - var iconEl = $('.btn-icon', btnBorders.cmpEl); + var iconEl = $('.icon', btnBorders.cmpEl); if (iconEl) { iconEl.removeClass(btnBorders.options.icls); @@ -575,7 +575,7 @@ define([ onHorizontalAlignMenu: function(menu, item) { var btnHorizontalAlign = this.toolbar.btnHorizontalAlign, - iconEl = $('.btn-icon', btnHorizontalAlign.cmpEl); + iconEl = $('.icon', btnHorizontalAlign.cmpEl); if (iconEl) { iconEl.removeClass(btnHorizontalAlign.options.icls); @@ -595,7 +595,7 @@ define([ onVerticalAlignMenu: function(menu, item) { var btnVerticalAlign = this.toolbar.btnVerticalAlign, - iconEl = $('.btn-icon', btnVerticalAlign.cmpEl); + iconEl = $('.icon', btnVerticalAlign.cmpEl); if (iconEl) { iconEl.removeClass(btnVerticalAlign.options.icls); @@ -1891,7 +1891,7 @@ define([ var btnHorizontalAlign = this.toolbar.btnHorizontalAlign; if (btnHorizontalAlign.rendered) { - var hIconEl = $('.btn-icon', btnHorizontalAlign.cmpEl); + var hIconEl = $('.icon', btnHorizontalAlign.cmpEl); if (hIconEl) { hIconEl.removeClass(btnHorizontalAlign.options.icls); @@ -1925,7 +1925,7 @@ define([ var btnVerticalAlign = this.toolbar.btnVerticalAlign; if (btnVerticalAlign.rendered) { - var vIconEl = $('.btn-icon', btnVerticalAlign.cmpEl); + var vIconEl = $('.icon', btnVerticalAlign.cmpEl); if (vIconEl) { vIconEl.removeClass(btnVerticalAlign.options.icls); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index c896e8cd7..a7c2864b6 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -1478,9 +1478,9 @@ define([ 'data-stopPropagation="true"', '<% } %>', '>', '', - '', + '', '', - '', + '', '' ].join('')), stopPropagation: true, @@ -1779,7 +1779,7 @@ define([ } this._state.hasCollaborativeChanges = true; - var iconEl = $('.btn-icon', this.btnSave.cmpEl); + var iconEl = $('.icon', this.btnSave.cmpEl); iconEl.removeClass(this.btnSaveCls); iconEl.addClass('btn-synch'); @@ -1815,7 +1815,7 @@ define([ synchronizeChanges: function() { if (this.btnSave.rendered) { - var iconEl = $('.btn-icon', this.btnSave.cmpEl); + var iconEl = $('.icon', this.btnSave.cmpEl); if (iconEl.hasClass('btn-synch')) { iconEl.removeClass('btn-synch'); @@ -1841,7 +1841,7 @@ define([ if (cls !== this.btnSaveCls && this.btnSave.rendered) { this.btnSaveTip = ((length>1) ? this.tipSaveCoauth : this.tipSave )+ Common.Utils.String.platformKey('Ctrl+S'); - var iconEl = $('.btn-icon', this.btnSave.cmpEl); + var iconEl = $('.icon', this.btnSave.cmpEl); if (!iconEl.hasClass('btn-synch')) { iconEl.removeClass(this.btnSaveCls); iconEl.addClass(cls);