Merge pull request #2964 from ONLYOFFICE/fix/bugfix

Fix/bugfix

apps/common/main/lib/component/Button.js

@@ -737,9 +737,9 @@ define([
         },
 
         setIconCls: function(cls) {
-            var btnIconEl = $(this.el).find('.icon'),
+            var btnIconEl = $(this.el).find('i.icon'),
                 oldCls = this.iconCls,
-                svgIcon = btnIconEl.find('use.zoom-int');
+                svgIcon = $(this.el).find('.icon use.zoom-int');
 
             this.iconCls = cls;
             if (/svgicon/.test(this.iconCls)) {
@@ -760,9 +760,9 @@ define([
 
         changeIcon: function(opts) {
             var me = this,
-                btnIconEl = $(this.el).find('.icon');
+                btnIconEl = $(this.el).find('i.icon');
             if (opts && (opts.curr || opts.next) && btnIconEl) {
-                var svgIcon = btnIconEl.find('use.zoom-int');
+                var svgIcon = $(this.el).find('.icon use.zoom-int');
                 !!opts.curr && (btnIconEl.removeClass(opts.curr));
                 !!opts.next && !btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
                 svgIcon.length && !!opts.next && svgIcon.attr('href', '#' + opts.next);

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

@@ -3609,7 +3609,7 @@ define([
 
             this.btnsComment = [];
             if ( config.canCoAuthoring && config.canComments ) {
-                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', this.toolbar.capBtnComment,
+                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', this.toolbar.capBtnComment,
                             [  Common.enumLock.paragraphLock, Common.enumLock.headerLock, Common.enumLock.richEditLock, Common.enumLock.plainEditLock, Common.enumLock.richDelLock, Common.enumLock.plainDelLock,
                                     Common.enumLock.cantAddQuotedComment, Common.enumLock.imageLock, Common.enumLock.inSpecificForm, Common.enumLock.inImage, Common.enumLock.lostConnect, Common.enumLock.disableOnStart,
                                     Common.enumLock.previewReviewMode, Common.enumLock.viewFormMode, Common.enumLock.docLockView, Common.enumLock.docLockForms, Common.enumLock.viewMode ],

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

@@ -480,7 +480,7 @@ define([
 
                     this.btnViewFormRoles = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'toolbar__icon btn-sheet-view',
+                        iconCls: 'toolbar__icon btn-big-sheet-view',
                         lock: [ _set.previewReviewMode, _set.formsNoRoles, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode],
                         caption: this.capBtnView,
                         split: true,

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

@@ -173,7 +173,7 @@ define([
                 this.btnsNotes = Common.Utils.injectButtons($host.find('.btn-slot.slot-notes'), '', 'toolbar__icon btn-notes', me.capBtnInsFootnote,
                     [_set.paragraphLock, _set.inEquation, _set.inImage, _set.inHeader, _set.controlPlain, _set.richEditLock, _set.plainEditLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode],
                     true, true, undefined, '1', 'bottom', 'small');
-                this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-inserthyperlink', me.capBtnInsLink,
+                this.btnsHyperlink = Common.Utils.injectButtons($host.find('.btn-slot.slot-inshyperlink'), '', 'toolbar__icon btn-big-inserthyperlink', me.capBtnInsLink,
                     [_set.paragraphLock, _set.headerLock, _set.hyperlinkLock, _set.previewReviewMode, _set.viewFormMode, _set.lostConnect, _set.disableOnStart, _set.docLockView, _set.docLockForms, _set.docLockComments, _set.viewMode],
                     undefined, undefined, undefined, '1', 'bottom', 'small');
                 Array.prototype.push.apply(this.paragraphControls, this.btnsContents.concat(this.btnsNotes, this.btnsHyperlink));

apps/pdfeditor/main/app/view/InsTab.js

@@ -216,7 +216,7 @@ define([
                 me.btnInsertHyperlink = new Common.UI.Button({
                     id: 'tlbtn-insertlink',
                     cls: 'btn-toolbar x-huge icon-top',
-                    iconCls: 'toolbar__icon btn-inserthyperlink',
+                    iconCls: 'toolbar__icon btn-big-inserthyperlink',
                     caption: me.capInsertHyperlink,
                     lock: [_set.hyperlinkLock, _set.paragraphLock, _set.lostConnect, _set.noParagraphSelected],
                     dataHint: '1',

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

@@ -776,7 +776,7 @@ define([
                     this.btnAddComment = new Common.UI.Button({
                         id: 'tlbtn-addcomment',
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'toolbar__icon btn-add-comment',
+                        iconCls: 'toolbar__icon btn-big-add-comment',
                         lock: [_set.disableOnStart],
                         caption: this.capBtnComment,
                         dataHint: '1',
@@ -788,7 +788,7 @@ define([
                     this.btnTextComment = new Common.UI.Button({
                         id: 'tlbtn-textcomment',
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'toolbar__icon btn-text-comment',
+                        iconCls: 'toolbar__icon btn-big-text-comment',
                         lock: [_set.disableOnStart],
                         caption: this.capBtnTextComment,
                         menu: true,
@@ -1383,14 +1383,14 @@ define([
                                     caption: me.tipInsertTextComment,
                                     iconCls     : 'menu__icon btn-text-comment',
                                     value: AscPDF.FREE_TEXT_INTENT_TYPE.FreeText,
-                                    iconClsForMainBtn: 'btn-text-comment',
+                                    iconClsForMainBtn: 'btn-big-text-comment',
                                     captionForMainBtn: me.capBtnTextComment
                                 },
                                 {
                                     caption: me.tipInsertTextCallout,
                                     iconCls     : 'menu__icon btn-text-callout',
                                     value: AscPDF.FREE_TEXT_INTENT_TYPE.FreeTextCallout,
-                                    iconClsForMainBtn: 'btn-text-callout',
+                                    iconClsForMainBtn: 'btn-big-text-callout',
                                     captionForMainBtn: me.capBtnTextCallout
                                 },
                             ]

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

@@ -2798,7 +2798,7 @@ define([
             this.btnsComment = [];
             if ( config.canCoAuthoring && config.canComments ) {
                 var _set = Common.enumLock;
-                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small');
+                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', me.toolbar.capBtnComment, [_set.lostConnect, _set.noSlides], undefined, undefined, undefined, '1', 'bottom', 'small');
 
                 if ( this.btnsComment.length ) {
                     var _comments = PE.getController('Common.Controllers.Comments').getView();

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

@@ -834,7 +834,7 @@ define([
                     me.btnInsertHyperlink = new Common.UI.Button({
                         id: 'tlbtn-insertlink',
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'toolbar__icon btn-inserthyperlink',
+                        iconCls: 'toolbar__icon btn-big-inserthyperlink',
                         caption: me.capInsertHyperlink,
                         lock: [_set.hyperlinkLock, _set.slideDeleted, _set.paragraphLock, _set.lostConnect, _set.noSlides, _set.noParagraphSelected],
                         dataHint: '1',

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

@@ -4692,7 +4692,7 @@ define([
             this.btnsComment = [];
             if ( config.canCoAuthoring && config.canComments ) {
                 var _set = Common.enumLock;
-                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-add-comment', this.toolbar.capBtnComment,
+                this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'toolbar__icon btn-big-add-comment', this.toolbar.capBtnComment,
                                                             [_set.lostConnect, _set.commentLock, _set.editCell, _set['Objects']], undefined, undefined, undefined, '1', 'bottom', 'small');
 
                 if ( this.btnsComment.length ) {

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

@@ -1246,7 +1246,7 @@ define([
                 me.btnInsertHyperlink = new Common.UI.Button({
                     id          : 'tlbtn-insertlink',
                     cls         : 'btn-toolbar x-huge icon-top',
-                    iconCls     : 'toolbar__icon btn-inserthyperlink',
+                    iconCls     : 'toolbar__icon btn-big-inserthyperlink',
                     caption     : me.capInsertHyperlink,
                     lock        : [_set.editCell, _set.selChart, _set.selChartText, _set.selImage, _set.selShape, _set.cantHyperlink, _set.selSlicer, _set.multiselect, _set.lostConnect, _set.coAuth, _set.editPivot, _set['InsertHyperlinks'], _set.userProtected],
                     dataHint    : '1',

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

@@ -191,7 +191,7 @@ define([
                 if ( me.appConfig.canFeatureViews && me.appConfig.isEdit ) {
                     this.btnSheetView = new Common.UI.Button({
                         cls: 'btn-toolbar x-huge icon-top',
-                        iconCls: 'toolbar__icon btn-sheet-view',
+                        iconCls: 'toolbar__icon btn-big-sheet-view',
                         caption: me.capBtnSheetView,
                         lock        : [_set.lostConnect, _set.coAuth, _set.editCell],
                         menu: true,