From 08cf339da5290accf8ace640ca60df4e5d3b9463 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Jun 2017 11:42:58 +0300 Subject: [PATCH 1/4] [DE] Bug with save status in the statusbar. --- apps/documenteditor/main/app/controller/Main.js | 5 ++++- apps/documenteditor/main/locale/en.json | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 88f0fd42a..1b18ebcd6 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2100,7 +2100,10 @@ define([ txtStyle_Subtitle: 'Subtitle', txtStyle_Quote: 'Quote', txtStyle_Intense_Quote: 'Intense Quote', - txtStyle_List_Paragraph: 'List Paragraph' + txtStyle_List_Paragraph: 'List Paragraph', + saveTextText: 'Saving document...', + saveTitleText: 'Saving Document' + } })(), DE.Controllers.Main || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2f131614a..c19227237 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -282,8 +282,8 @@ "DE.Controllers.Main.saveErrorText": "An error has occurred while saving the file", "DE.Controllers.Main.savePreparingText": "Preparing to save", "DE.Controllers.Main.savePreparingTitle": "Preparing to save. Please wait...", - "del_DE.Controllers.Main.saveTextText": "Saving document...", - "del_DE.Controllers.Main.saveTitleText": "Saving Document", + "DE.Controllers.Main.saveTextText": "Saving document...", + "DE.Controllers.Main.saveTitleText": "Saving Document", "DE.Controllers.Main.sendMergeText": "Sending Merge...", "DE.Controllers.Main.sendMergeTitle": "Sending Merge", "DE.Controllers.Main.splitDividerErrorText": "The number of rows must be a divisor of %1.", From 7f68ab09b65469cff5454278ddc6370a3b416fef Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Jun 2017 11:43:50 +0300 Subject: [PATCH 2/4] Bug with opening context menu when toolbar isn't folded. --- apps/common/main/lib/component/Mixtbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/common/main/lib/component/Mixtbar.js b/apps/common/main/lib/component/Mixtbar.js index eea3de7db..0798a0fe9 100644 --- a/apps/common/main/lib/component/Mixtbar.js +++ b/apps/common/main/lib/component/Mixtbar.js @@ -164,7 +164,7 @@ define([ }, collapseToolbar: function() { - if ( optsFold.$bar ) { + if ( this.isFolded && optsFold.$bar ) { optsFold.$bar.removeClass('expanded'); optsFold.$bar.find('.tabs .ribtab').removeClass('active'); } From c529667cb4b8697e6ea8aa5ac21b0e464c14e604 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Wed, 28 Jun 2017 14:16:09 +0300 Subject: [PATCH 3/4] debug toolbar's big buttons --- .../resources/img/controls/toolbarbig.png | Bin 7162 -> 6587 bytes .../resources/img/controls/toolbarbig@2x.png | Bin 15341 -> 15327 bytes apps/common/main/resources/less/toolbar.less | 20 ++++++++++ .../main/resources/less/toolbar.less | 19 --------- .../main/app/controller/Toolbar.js | 2 +- .../main/app/view/Toolbar.js | 2 +- .../main/resources/less/toolbar.less | 36 +++++++++--------- .../main/app/controller/Toolbar.js | 2 +- .../main/resources/less/toolbar.less | 12 +++--- 9 files changed, 47 insertions(+), 46 deletions(-) diff --git a/apps/common/main/resources/img/controls/toolbarbig.png b/apps/common/main/resources/img/controls/toolbarbig.png index 988d87fddc5b747c91523535789d6954b2a3e21d..46aca94a1e165379f3855d31b777946e406b0942 100644 GIT binary patch literal 6587 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 LX((b|n1A{Y;PJM+ literal 7162 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 diff --git a/apps/common/main/resources/img/controls/toolbarbig@2x.png b/apps/common/main/resources/img/controls/toolbarbig@2x.png index 073facabac8d2b0b9c7f63e4ba82e0dc2652cc90..4b49b6d5da8e2a73340205a09a77e0a8ed0efc04 100644 GIT binary patch literal 15327 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 R059%>q{S6Jl#3Y!{U6!E%9Q{B literal 15341 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 B=Ewj5 diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less index a75974f47..2484f0643 100644 --- a/apps/common/main/resources/less/toolbar.less +++ b/apps/common/main/resources/less/toolbar.less @@ -261,3 +261,23 @@ } .button-otherstates-icon2(btn-toolbar, @toolbar-icon-size); + +@toolbar-big-icon-size: 26px; +.button-normal-icon(btn-inserttable, 0, @toolbar-big-icon-size); +.button-normal-icon(btn-insertimage, 1, @toolbar-big-icon-size); +.button-normal-icon(btn-insertchart, 2, @toolbar-big-icon-size); +.button-normal-icon(btn-text, 3, @toolbar-big-icon-size); +.button-normal-icon(btn-insertshape, 4, @toolbar-big-icon-size); +.button-normal-icon(btn-ic-doclang, 5, @toolbar-big-icon-size); +.button-normal-icon(btn-textart, 6, @toolbar-big-icon-size); +.button-normal-icon(btn-insertequation, 7, @toolbar-big-icon-size); +.button-normal-icon(btn-notes, 8, @toolbar-big-icon-size); +.button-normal-icon(btn-inserthyperlink, 9, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-menu-comments', 10, @toolbar-big-icon-size); +.button-normal-icon(btn-addslide, 11, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @toolbar-big-icon-size); +.button-normal-icon(~'x-huge .btn-ic-review', 13, @toolbar-big-icon-size); +.button-normal-icon(review-save, 14, @toolbar-big-icon-size); +.button-normal-icon(review-deny, 15, @toolbar-big-icon-size); +.button-normal-icon(review-next, 16, @toolbar-big-icon-size); +.button-normal-icon(review-prev, 17, @toolbar-big-icon-size); diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less index 20536ef62..eaaca90ff 100644 --- a/apps/documenteditor/main/resources/less/toolbar.less +++ b/apps/documenteditor/main/resources/less/toolbar.less @@ -225,7 +225,6 @@ } @toolbar-icon-size: 20px; -@toolbar-big-icon-size: 26px; .button-normal-icon(btn-align-center, 0, @toolbar-icon-size); .button-normal-icon(btn-align-just, 1, @toolbar-icon-size); .button-normal-icon(btn-align-left, 2, @toolbar-icon-size); @@ -302,24 +301,6 @@ //.button-normal-icon(review-save, 81, @toolbar-icon-size); //.button-normal-icon(review-deny, 82, @toolbar-icon-size); -.button-normal-icon(btn-inserttable, 0, @toolbar-big-icon-size); -.button-normal-icon(btn-insertimage, 1, @toolbar-big-icon-size); -.button-normal-icon(btn-insertshape, 2, @toolbar-big-icon-size); -.button-normal-icon(btn-text, 3, @toolbar-big-icon-size); -.button-normal-icon(btn-inserthyperlink, 4, @toolbar-big-icon-size); -.button-normal-icon(~'x-huge .btn-menu-comments', 5, @toolbar-big-icon-size); -.button-normal-icon(btn-textart, 6, @toolbar-big-icon-size); -.button-normal-icon(btn-insertequation, 7, @toolbar-big-icon-size); -.button-normal-icon(btn-insertchart, 9, @toolbar-big-icon-size); -.button-normal-icon(btn-notes, 8, @toolbar-big-icon-size); -.button-normal-icon(btn-ic-doclang, 11, @toolbar-big-icon-size); -.button-normal-icon(~'x-huge .btn-ic-docspell', 12, @toolbar-big-icon-size); -.button-normal-icon(~'x-huge .btn-ic-review', 13, @toolbar-big-icon-size); -.button-normal-icon(review-save, 14, @toolbar-big-icon-size); -.button-normal-icon(review-deny, 15, @toolbar-big-icon-size); -.button-normal-icon(review-next, 16, @toolbar-big-icon-size); -.button-normal-icon(review-prev, 17, @toolbar-big-icon-size); - @menu-icon-size: 22px; .menu-icon-normal(mnu-wrap-inline, 0, @menu-icon-size); .menu-icon-normal(mnu-wrap-square, 1, @menu-icon-size); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 9ee7a08ea..e3343b620 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -2068,7 +2068,7 @@ define([ var button = new Common.UI.Button({ cls: _cls, - iconCls: 'svgicon svg-btn-comments', + iconCls: 'btn-menu-comments', caption: me.toolbar.capBtnComment }).render( slots.eq(index) ); diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 63bc160cc..365e20f42 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -1016,7 +1016,7 @@ define([ slot: '.slot-inserttext', btnconfig: { cls : 'btn-toolbar x-huge icon-top', - iconCls : 'btn-inserttext', + iconCls : 'btn-text', caption : me.capInsertText, lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], enableToggle: true, diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less index 6f6d55dba..687417ca8 100644 --- a/apps/presentationeditor/main/resources/less/toolbar.less +++ b/apps/presentationeditor/main/resources/less/toolbar.less @@ -258,13 +258,13 @@ .toolbar-btn-icon(btn-align-shape, 38, @toolbar-icon-size); //.toolbar-btn-icon(btn-insertshape, 39, @toolbar-icon-size); -.button-normal-icon(btn-insertshape, 39, @toolbar-icon-size); +//.button-normal-icon(btn-insertshape, 39, @toolbar-icon-size); -.toolbar-btn-icon(btn-inserttext, 40, @toolbar-icon-size); -.toolbar-btn-icon(btn-inserthyperlink, 41, @toolbar-icon-size); -.toolbar-btn-icon(btn-inserttable, 42, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertimage, 43, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertchart, 44, @toolbar-icon-size); +//.toolbar-btn-icon(btn-inserttext, 40, @toolbar-icon-size); +//.toolbar-btn-icon(btn-inserthyperlink, 41, @toolbar-icon-size); +//.toolbar-btn-icon(btn-inserttable, 42, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertimage, 43, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertchart, 44, @toolbar-icon-size); .toolbar-btn-icon(btn-colorschemas, 45, @toolbar-icon-size); .toolbar-btn-icon(btn-slidesize, 46, @toolbar-icon-size); .toolbar-btn-icon(btn-hidebars, 47, @toolbar-icon-size); @@ -272,21 +272,21 @@ .toolbar-btn-icon(btn-zoomin, 61, @toolbar-icon-size); .toolbar-btn-icon(btn-zoomout, 60, @toolbar-icon-size); .toolbar-btn-icon(btn-save-coauth, 69, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertequation, 74, @toolbar-icon-size); // add slide -.btn-toolbar .btn-addslide {background-position: 0 -120px;} -.btn-toolbar.active > .btn-addslide, -.btn-toolbar:active > .btn-addslide {background-position: -20px -120px;} -.btn-toolbar.disabled:not(.active) > .btn-addslide {background-position: -40px -120px;} -.btn-toolbar.disabled > .btn-addslide {background-position: -20px -120px; opacity: 0.6;} +//.btn-toolbar .btn-addslide {background-position: 0 -120px;} +//.btn-toolbar.active > .btn-addslide, +//.btn-toolbar:active > .btn-addslide {background-position: -20px -120px;} +//.btn-toolbar.disabled:not(.active) > .btn-addslide {background-position: -40px -120px;} +//.btn-toolbar.disabled > .btn-addslide {background-position: -20px -120px; opacity: 0.6;} -.btn-toolbar.large .btn-addslide {background-position: 0px -5px;} -//.btn-group.open .btn-toolbar.large > .btn-addslide, -.btn-toolbar.large.active > .btn-addslide, -.btn-toolbar.large:active > .btn-addslide {background-position: 0px -45px;} -.btn-toolbar.large.disabled:not(.active) > .btn-addslide {background-position: 0px -85px;} -.btn-toolbar.large.disabled > .btn-addslide {background-position: 0px -45px; opacity: 0.6;} +//.btn-toolbar.large .btn-addslide {background-position: 0px -5px;} +////.btn-group.open .btn-toolbar.large > .btn-addslide, +//.btn-toolbar.large.active > .btn-addslide, +//.btn-toolbar.large:active > .btn-addslide {background-position: 0px -45px;} +//.btn-toolbar.large.disabled:not(.active) > .btn-addslide {background-position: 0px -85px;} +//.btn-toolbar.large.disabled > .btn-addslide {background-position: 0px -45px; opacity: 0.6;} @menu-icon-size: 22px; .menu-btn-icon(mnu-align-center, 0, @menu-icon-size); diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 944350a84..e1dace8af 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -2893,7 +2893,7 @@ define([ var button = new Common.UI.Button({ cls: _cls, - iconCls: 'svgicon svg-btn-comments', + iconCls: 'btn-menu-comments', caption: me.toolbar.capBtnComment }).render( slots.eq(index) ); diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less index f0ed5f470..f24c03c53 100644 --- a/apps/spreadsheeteditor/main/resources/less/toolbar.less +++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less @@ -128,9 +128,9 @@ .toolbar-btn-icon(btn-border-center, 31, @toolbar-icon-size); .toolbar-btn-icon(btn-border-hmiddle, 32, @toolbar-icon-size); .toolbar-btn-icon(btn-border-vmiddle, 33, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertimage, 34, @toolbar-icon-size); -.toolbar-btn-icon(btn-inserthyperlink, 35, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertchart, 36, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertimage, 34, @toolbar-icon-size); +//.toolbar-btn-icon(btn-inserthyperlink, 35, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertchart, 36, @toolbar-icon-size); .toolbar-btn-icon(btn-copy, 37, @toolbar-icon-size); .toolbar-btn-icon(btn-paste, 38, @toolbar-icon-size); .toolbar-btn-icon(btn-synch, 39, @toolbar-icon-size); @@ -141,8 +141,8 @@ .toolbar-btn-icon(btn-incfont, 44, @toolbar-icon-size); .toolbar-btn-icon(btn-decfont, 45, @toolbar-icon-size); .toolbar-btn-icon(btn-text-orient, 46, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertshape, 47, @toolbar-icon-size); -.toolbar-btn-icon(btn-text, 48, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertshape, 47, @toolbar-icon-size); +//.toolbar-btn-icon(btn-text, 48, @toolbar-icon-size); .toolbar-btn-icon(btn-sort-up, 49, @toolbar-icon-size); .toolbar-btn-icon(btn-clear-filter, 50, @toolbar-icon-size); .toolbar-btn-icon(btn-percent-style, 51, @toolbar-icon-size); @@ -164,7 +164,7 @@ .toolbar-btn-icon(btn-border-diagdown, 43, @toolbar-icon-size); .toolbar-btn-icon(btn-named-range, 77, @toolbar-icon-size); -.toolbar-btn-icon(btn-insertequation, 82, @toolbar-icon-size); +//.toolbar-btn-icon(btn-insertequation, 82, @toolbar-icon-size); @menu-icon-size: 22px; .menu-btn-icon(mnu-align-center, 0, @menu-icon-size); From fae286743119ff5af05eacd130af487dce2fdfc5 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 28 Jun 2017 14:20:49 +0300 Subject: [PATCH 4/4] Disable/enable comment button in the toolbar. --- apps/common/main/lib/controller/Comments.js | 5 ++--- .../main/app/controller/Toolbar.js | 16 ++++++++++----- .../main/app/controller/Toolbar.js | 20 +++++++++++++------ .../main/app/view/Toolbar.js | 3 ++- .../main/app/controller/Toolbar.js | 18 ++++++++++------- .../main/app/view/Toolbar.js | 3 ++- 6 files changed, 42 insertions(+), 23 deletions(-) diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 867fb158a..bf32c4481 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -584,9 +584,8 @@ define([ } }, onAppAddComment: function () { - if ( this.api.can_AddQuotedComment() !== false ) { - this.addDummyComment(); - } + if ( this.can_AddQuotedComment && this.api.can_AddQuotedComment() === false ) return; + this.addDummyComment(); }, // SDK diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index a441ba4d2..023b12c95 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -728,6 +728,12 @@ define([ if (toolbar.listStylesAdditionalMenuItem && (frame_pr===undefined) !== toolbar.listStylesAdditionalMenuItem.isDisabled()) toolbar.listStylesAdditionalMenuItem.setDisabled(frame_pr===undefined); + need_disable = paragraph_locked || header_locked || in_chart || this.api.can_AddQuotedComment()===false; + if (this.btnsComment && this.btnsComment.length>0 && need_disable != this.btnsComment[0].isDisabled()) + _.each (this.btnsComment, function(item){ + item.setDisabled(need_disable); + }, this); + this._state.in_equation = in_equation; }, @@ -2787,7 +2793,7 @@ define([ var me = this; if ( config.canCoAuthoring && config.canComments ) { - var _btnsComment = []; + this.btnsComment = []; var slots = me.toolbar.$el.find('.slot-comment'); slots.each(function(index, el) { var _cls = 'btn-toolbar'; @@ -2799,13 +2805,13 @@ define([ caption: me.toolbar.capBtnComment }).render( slots.eq(index) ); - _btnsComment.push(button); + me.btnsComment.push(button); }); - if ( _btnsComment.length ) { + if ( this.btnsComment.length ) { var _comments = DE.getController('Common.Controllers.Comments').getView(); - Array.prototype.push.apply(me.toolbar.toolbarControls, _btnsComment); - _btnsComment.forEach(function (btn) { + Array.prototype.push.apply(me.toolbar.paragraphControls, this.btnsComment); + this.btnsComment.forEach(function (btn) { btn.updateHint( _comments.textAddComment ); btn.on('click', function (btn, e) { Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 9ee7a08ea..1a278f294 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -584,6 +584,8 @@ define([ ]}); this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.toolbar.btnsInsertImage.concat(this.toolbar.btnsInsertText, this.toolbar.btnsInsertShape) }); + if (this.btnsComment) + this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment }); } }, @@ -648,9 +650,11 @@ define([ if (shape_locked!==undefined && this._state.shapecontrolsdisable !== shape_locked) { if (this._state.activated) this._state.shapecontrolsdisable = shape_locked; - this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls)}); + this.toolbar.lockToolbar(PE.enumLock.shapeLock, shape_locked, {array: me.toolbar.shapeControls.concat(me.toolbar.paragraphControls).concat(me.btnsComment)}); } + this.toolbar.lockToolbar(PE.enumLock.commentLock, this.api.can_AddQuotedComment() === false, { array: this.btnsComment }); + if (this._state.no_object !== no_object ) { if (this._state.activated) this._state.no_object = no_object; this.toolbar.lockToolbar(PE.enumLock.noObjectSelected, no_object, {array: [me.toolbar.btnShapeAlign, me.toolbar.btnShapeArrange ]}); @@ -2059,8 +2063,9 @@ define([ onAppReady: function (config) { var me = this; + this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { - var _btnsComment = []; + var _set = PE.enumLock; var slots = me.toolbar.$el.find('.slot-comment'); slots.each(function(index, el) { var _cls = 'btn-toolbar'; @@ -2069,21 +2074,24 @@ define([ var button = new Common.UI.Button({ cls: _cls, iconCls: 'svgicon svg-btn-comments', + lock: [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.shapeLock, _set.commentLock], caption: me.toolbar.capBtnComment }).render( slots.eq(index) ); - _btnsComment.push(button); + me.btnsComment.push(button); }); - if ( _btnsComment.length ) { + if ( this.btnsComment.length ) { var _comments = PE.getController('Common.Controllers.Comments').getView(); - // Array.prototype.push.apply(me.toolbar.toolbarControls, _btnsComment); - _btnsComment.forEach(function (btn) { + Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); + Array.prototype.push.apply(me.toolbar.slideOnlyControls, this.btnsComment); + this.btnsComment.forEach(function (btn) { btn.updateHint( _comments.textAddComment ); btn.on('click', function (btn, e) { Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); }); }, this); + this.toolbar.lockToolbar(PE.enumLock.noSlides, this._state.no_slides, { array: this.btnsComment }); } } diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 63bc160cc..88fc2642b 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -79,7 +79,8 @@ define([ disableOnStart: 'on-start', cantPrint: 'cant-print', noTextSelected: 'no-text', - inEquation: 'in-equation' + inEquation: 'in-equation', + commentLock: 'can-comment' }; var buttonsArray = function (opts) { diff --git a/apps/spreadsheeteditor/main/app/controller/Toolbar.js b/apps/spreadsheeteditor/main/app/controller/Toolbar.js index 944350a84..96f260085 100644 --- a/apps/spreadsheeteditor/main/app/controller/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/controller/Toolbar.js @@ -1600,7 +1600,7 @@ define([ toolbar.mnuitemClearFilter, toolbar.btnNamedRange.menu.items[0], toolbar.btnNamedRange.menu.items[1] - ], + ].concat(this.btnsComment), merge: true, clear: [SSE.enumLock.editFormula, SSE.enumLock.editText] }); @@ -2087,6 +2087,8 @@ define([ toolbar.btnAddCell.menu.items[1].setDisabled(this._state.controlsdisabled.cells_down); toolbar.btnDeleteCell.menu.items[1].setDisabled(this._state.controlsdisabled.cells_down); } + + toolbar.lockToolbar(SSE.enumLock.commentLock, info.asc_getComments().length>0, { array: this.btnsComment }); }, onApiSelectionChanged_DiagramEditor: function(info) { @@ -2674,7 +2676,7 @@ define([ toolbar.mnuitemSortZA, toolbar.mnuitemAutoFilter, toolbar.mnuitemClearFilter - ], + ].concat(this.btnsComment), merge: true, clear: [_set.selImage, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.coAuth] }); @@ -2884,8 +2886,9 @@ define([ onAppReady: function (config) { var me = this; + this.btnsComment = []; if ( config.canCoAuthoring && config.canComments ) { - var _btnsComment = []; + var _set = SSE.enumLock; var slots = me.toolbar.$el.find('.slot-comment'); slots.each(function(index, el) { var _cls = 'btn-toolbar'; @@ -2894,16 +2897,17 @@ define([ var button = new Common.UI.Button({ cls: _cls, iconCls: 'svgicon svg-btn-comments', + lock: [_set.editCell, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.commentLock], caption: me.toolbar.capBtnComment }).render( slots.eq(index) ); - _btnsComment.push(button); + me.btnsComment.push(button); }); - if ( _btnsComment.length ) { + if ( this.btnsComment.length ) { var _comments = SSE.getController('Common.Controllers.Comments').getView(); - Array.prototype.push.apply(me.toolbar.lockControls, _btnsComment); - _btnsComment.forEach(function (btn) { + Array.prototype.push.apply(me.toolbar.lockControls, this.btnsComment); + this.btnsComment.forEach(function (btn) { btn.updateHint( _comments.textAddComment ); btn.on('click', function (btn, e) { Common.NotificationCenter.trigger('app:comment:add', 'toolbar'); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index 41461ee3e..145977b16 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -76,7 +76,8 @@ define([ menuFileOpen: 'menu-file-open', cantPrint: 'cant-print', multiselect: 'is-multiselect', - cantHyperlink: 'cant-hyperlink' + cantHyperlink: 'cant-hyperlink', + commentLock: 'can-comment' }; SSE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend({