Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Use ButtonsArray for group of buttons

Browse source
This commit is contained in:
Julia Radzhabova 2019-06-11 10:52:13 +03:00
parent 756a02cfb9
commit e347b92a0f
6 changed files with 40 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
apps/common/main/lib/util/utils.js
View file

@ -822,6 +822,30 @@ Common.Utils.lockControls = function(causes, lock, opts, defControls) {
}); });
}; };
Common.Utils.injectButtons = function($slots, id, iconCls, caption, lock, split, menu, toggle) {
var btnsArr = createButtonSet();
id = id || ("id-toolbar-" + iconCls);
$slots.each(function(index, el) {
var _cls = 'btn-toolbar';
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({
id: id + index,
cls: _cls,
iconCls: iconCls,
caption: caption,
split: split || false,
menu: menu || false,
enableToggle: toggle || false,
lock: lock,
disabled: true
}).render( $slots.eq(index) );
btnsArr.add(button);
});
return btnsArr;
};
Common.Utils.injectComponents = function ($slots, id, iconCls, caption, lock, split, menu, toggle) { Common.Utils.injectComponents = function ($slots, id, iconCls, caption, lock, split, menu, toggle) {
var btnsArr = []; var btnsArr = [];
id = id || ("id-toolbar-" + iconCls); id = id || ("id-toolbar-" + iconCls);

17
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -2832,22 +2832,7 @@ define([
me.appOptions = config; me.appOptions = config;
if ( config.canCoAuthoring && config.canComments ) { if ( config.canCoAuthoring && config.canComments ) {
this.btnsComment = createButtonSet(); this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', this.toolbar.capBtnComment);
var slots = me.toolbar.$el.find('.slot-comment');
slots.each(function(index, el) {
var _cls = 'btn-toolbar';
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({
id: 'tlbtn-addcomment-' + index,
cls: _cls,
iconCls: 'btn-menu-comments',
caption: me.toolbar.capBtnComment
}).render( slots.eq(index) );
me.btnsComment.add(button);
});
if ( this.btnsComment.length ) { if ( this.btnsComment.length ) {
var _comments = DE.getController('Common.Controllers.Comments').getView(); var _comments = DE.getController('Common.Controllers.Comments').getView();
this.btnsComment.forEach(function (btn) { this.btnsComment.forEach(function (btn) {

26
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1319,30 +1319,8 @@ define([
_injectComponent('#slot-img-movebkwd', this.btnImgBackward); _injectComponent('#slot-img-movebkwd', this.btnImgBackward);
_injectComponent('#slot-img-wrapping', this.btnImgWrapping); _injectComponent('#slot-img-wrapping', this.btnImgWrapping);
+function injectBreakButtons() { this.btnsPageBreak = Common.Utils.injectButtons($host.find('.btn-slot.btn-pagebreak'), '', 'btn-pagebreak', this.capBtnInsPagebreak, undefined, true, true);
var me = this; Array.prototype.push.apply(this.paragraphControls, this.btnsPageBreak);
me.btnsPageBreak = createButtonSet();
var $slots = $host.find('.btn-slot.btn-pagebreak');
$slots.each(function(index, el) {
var _cls = 'btn-toolbar';
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({
cls: _cls,
iconCls: 'btn-pagebreak',
caption: me.capBtnInsPagebreak,
split: true,
menu: true
}).render( $slots.eq(index) );
me.btnsPageBreak.add(button);
});
me.btnsPageBreak.setDisabled(true);
Array.prototype.push.apply(me.paragraphControls, me.btnsPageBreak);
}.call(this);
return $host; return $host;
}, },

2
apps/presentationeditor/main/app/controller/Toolbar.js
View file

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

80
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -926,78 +926,20 @@ define([
_injectComponent('#slot-btn-slidesize', this.btnSlideSize); _injectComponent('#slot-btn-slidesize', this.btnSlideSize);
_injectComponent('#slot-field-styles', this.listTheme); _injectComponent('#slot-field-styles', this.listTheme);
function _injectBtns(opts) { this.btnsInsertImage = Common.Utils.injectButtons($host.find('.slot-insertimg'), 'tlbtn-insertimage-', 'btn-insertimage', this.capInsertImage,
var array = createButtonSet(); [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true);
var $slots = $host.find(opts.slot); this.btnsInsertText = Common.Utils.injectButtons($host.find('.slot-instext'), 'tlbtn-inserttext-', 'btn-text', this.capInsertText,
var id = opts.btnconfig.id; [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, false, true);
$slots.each(function(index, el) { this.btnsInsertShape = Common.Utils.injectButtons($host.find('.slot-insertshape'), 'tlbtn-insertshape-', 'btn-insertshape', this.capInsertShape,
if ( !!id ) opts.btnconfig.id = id + index; [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart], false, true, true);
this.btnsAddSlide = Common.Utils.injectButtons($host.find('.slot-addslide'), 'tlbtn-addslide-', 'btn-addslide', this.capAddSlide,
[PE.enumLock.menuFileOpen, PE.enumLock.lostConnect, PE.enumLock.disableOnStart], true, true);
var button = new Common.UI.Button(opts.btnconfig); var created = this.btnsInsertImage.concat(this.btnsInsertText, this.btnsInsertShape, this.btnsAddSlide);
button.render( $slots.eq(index) );
array.add(button);
});
return array;
}
var me = this;
me.btnsInsertImage = _injectBtns({
slot: '.slot-insertimg',
btnconfig: {
id : 'tlbtn-insertimage-',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertimage',
caption : me.capInsertImage,
lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
menu : true
}
});
me.btnsInsertText = _injectBtns({
slot: '.slot-instext',
btnconfig: {
id : 'tlbtn-inserttext-',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text',
caption : me.capInsertText,
lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
enableToggle: true
}
});
me.btnsInsertShape = _injectBtns({
slot: '.slot-insertshape',
btnconfig: {
id : 'tlbtn-insertshape-',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertshape',
caption : me.capInsertShape,
lock : [PE.enumLock.slideDeleted, PE.enumLock.lostConnect, PE.enumLock.noSlides, PE.enumLock.disableOnStart],
enableToggle: true,
menu : true
}
});
me.btnsAddSlide = _injectBtns({
slot: '.slot-addslide',
btnconfig: {
id : 'tlbtn-addslide-',
cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-addslide',
split : true,
caption : me.capAddSlide,
lock : [PE.enumLock.menuFileOpen, PE.enumLock.lostConnect, PE.enumLock.disableOnStart],
menu : true
}
});
var created = me.btnsInsertImage.concat(me.btnsInsertText, me.btnsInsertShape, me.btnsAddSlide);
this.lockToolbar(PE.enumLock.disableOnStart, true, {array: created}); this.lockToolbar(PE.enumLock.disableOnStart, true, {array: created});
Array.prototype.push.apply(me.slideOnlyControls, created); Array.prototype.push.apply(this.slideOnlyControls, created);
Array.prototype.push.apply(me.lockControls, created); Array.prototype.push.apply(this.lockControls, created);
return $host; return $host;
}, },

2
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -3147,7 +3147,7 @@ define([
this.btnsComment = []; this.btnsComment = [];
if ( config.canCoAuthoring && config.canComments ) { if ( config.canCoAuthoring && config.canComments ) {
var _set = SSE.enumLock; var _set = SSE.enumLock;
me.btnsComment = Common.Utils.injectComponents(me.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', me.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock]); this.btnsComment = Common.Utils.injectButtons(this.toolbar.$el.find('.slot-comment'), 'tlbtn-addcomment-', 'btn-menu-comments', this.toolbar.capBtnComment, [_set.lostConnect, _set.commentLock]);
if ( this.btnsComment.length ) { if ( this.btnsComment.length ) {
var _comments = SSE.getController('Common.Controllers.Comments').getView(); var _comments = SSE.getController('Common.Controllers.Comments').getView();