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

unified toolbar's components identifiers

Browse source
This commit is contained in:
Maxim Kadushkin 2017-08-08 18:00:55 +03:00
parent 50fd0152e7
commit c76a24beeb
6 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2832,6 +2832,7 @@ define([
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); /x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({ var button = new Common.UI.Button({
id: 'tlbtn-addcomment-' + index,
cls: _cls, cls: _cls,
iconCls: 'btn-menu-comments', iconCls: 'btn-menu-comments',
caption: me.toolbar.capBtnComment caption: me.toolbar.capBtnComment

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

@ -455,7 +455,7 @@ define([
this.mnuMultilevelPicker = clone(this.mnuMarkersPicker); this.mnuMultilevelPicker = clone(this.mnuMarkersPicker);
this.btnInsertTable = new Common.UI.Button({ this.btnInsertTable = new Common.UI.Button({
id: 'tlb-btn-instable', id: 'tlbtn-inserttable',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-inserttable', iconCls: 'btn-inserttable',
caption: me.capBtnInsTable, caption: me.capBtnInsTable,
@ -469,7 +469,7 @@ define([
this.paragraphControls.push(this.btnInsertTable); this.paragraphControls.push(this.btnInsertTable);
this.btnInsertImage = new Common.UI.Button({ this.btnInsertImage = new Common.UI.Button({
id: 'tlb-btn-insimage', id: 'tlbtn-insertimage',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-insertimage', iconCls: 'btn-insertimage',
caption: me.capBtnInsImage, caption: me.capBtnInsImage,
@ -483,7 +483,7 @@ define([
this.paragraphControls.push(this.btnInsertImage); this.paragraphControls.push(this.btnInsertImage);
this.btnInsertChart = new Common.UI.Button({ this.btnInsertChart = new Common.UI.Button({
id: 'tlb-btn-inschart', id: 'tlbtn-insertchart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
caption: me.capBtnInsChart, caption: me.capBtnInsChart,
iconCls: 'btn-insertchart', iconCls: 'btn-insertchart',
@ -497,7 +497,7 @@ define([
this.paragraphControls.push(this.btnInsertChart); this.paragraphControls.push(this.btnInsertChart);
this.btnInsertText = new Common.UI.Button({ this.btnInsertText = new Common.UI.Button({
id: 'tlb-btn-inserttext', id: 'tlbtn-inserttext',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-text', iconCls: 'btn-text',
caption: me.capBtnInsTextbox, caption: me.capBtnInsTextbox,
@ -505,7 +505,7 @@ define([
}); });
this.paragraphControls.push(this.btnInsertText); this.paragraphControls.push(this.btnInsertText);
this.btnInsertTextArt = new Common.UI.Button({ this.btnInsertTextArt = new Common.UI.Button({
id: 'tlb-btn-instextart', id: 'tlbtn-inserttextart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-textart', iconCls: 'btn-textart',
caption: me.capBtnInsTextart, caption: me.capBtnInsTextart,
@ -519,7 +519,7 @@ define([
this.paragraphControls.push(this.btnInsertTextArt); this.paragraphControls.push(this.btnInsertTextArt);
this.btnInsertHyperlink = new Common.UI.Button({ this.btnInsertHyperlink = new Common.UI.Button({
id: 'tlb-btn-inshyperlink', id: 'tlbtn-insertlink',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
caption: me.capBtnInsLink, caption: me.capBtnInsLink,
iconCls: 'btn-inserthyperlink' iconCls: 'btn-inserthyperlink'
@ -550,7 +550,7 @@ define([
this.toolbarControls.push(this.btnEditHeader); this.toolbarControls.push(this.btnEditHeader);
this.btnInsertShape = new Common.UI.Button({ this.btnInsertShape = new Common.UI.Button({
id: 'tlb-btn-insshape', id: 'tlbtn-insertshape',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-insertshape', iconCls: 'btn-insertshape',
caption: me.capBtnInsShape, caption: me.capBtnInsShape,
@ -560,7 +560,7 @@ define([
this.paragraphControls.push(this.btnInsertShape); this.paragraphControls.push(this.btnInsertShape);
this.btnInsertEquation = new Common.UI.Button({ this.btnInsertEquation = new Common.UI.Button({
id: 'tlb-btn-insequation', id: 'tlbtn-insertequation',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-insertequation', iconCls: 'btn-insertequation',
caption: me.capBtnInsEquation, caption: me.capBtnInsEquation,
@ -570,7 +570,7 @@ define([
this.paragraphControls.push(this.btnInsertEquation); this.paragraphControls.push(this.btnInsertEquation);
this.btnDropCap = new Common.UI.Button({ this.btnDropCap = new Common.UI.Button({
id: 'tlb-btn-dropcap', id: 'tlbtn-dropcap',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-dropcap', iconCls: 'btn-dropcap',
caption: me.capBtnInsDropcap, caption: me.capBtnInsDropcap,
@ -607,7 +607,7 @@ define([
this.paragraphControls.push(this.btnDropCap); this.paragraphControls.push(this.btnDropCap);
this.btnColumns = new Common.UI.Button({ this.btnColumns = new Common.UI.Button({
id: 'tlb-btn-columns', id: 'tlbtn-columns',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-columns', iconCls: 'btn-columns',
caption: me.capBtnColumns, caption: me.capBtnColumns,
@ -657,7 +657,7 @@ define([
this.paragraphControls.push(this.btnColumns); this.paragraphControls.push(this.btnColumns);
this.btnPageOrient = new Common.UI.Button({ this.btnPageOrient = new Common.UI.Button({
id: 'tlb-btn-pageorient', id: 'tlbtn-pageorient',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pageorient', iconCls: 'btn-pageorient',
caption: me.capBtnPageOrient, caption: me.capBtnPageOrient,
@ -693,7 +693,7 @@ define([
'<% } %></a>'); '<% } %></a>');
this.btnPageMargins = new Common.UI.Button({ this.btnPageMargins = new Common.UI.Button({
id: 'tlb-btn-pagemargins', id: 'tlbtn-pagemargins',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pagemargins', iconCls: 'btn-pagemargins',
caption: me.capBtnMargins, caption: me.capBtnMargins,
@ -752,7 +752,7 @@ define([
'<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></div></a>'); '<%= parseFloat(Common.Utils.Metric.fnRecalcFromMM(options.value[1]).toFixed(2)) %> <%= Common.Utils.Metric.getCurrentMetricName() %></div></a>');
this.btnPageSize = new Common.UI.Button({ this.btnPageSize = new Common.UI.Button({
id: 'tlb-btn-pagesize', id: 'tlbtn-pagesize',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-pagesize', iconCls: 'btn-pagesize',
caption: me.capBtnPageSize, caption: me.capBtnPageSize,

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

@ -2074,6 +2074,7 @@ define([
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); /x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({ var button = new Common.UI.Button({
id: 'tlbtn-addcomment-' + index,
cls: _cls, cls: _cls,
iconCls: 'btn-menu-comments', iconCls: 'btn-menu-comments',
lock: [_set.lostConnect, _set.noSlides], lock: [_set.lostConnect, _set.noSlides],

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

@ -537,7 +537,7 @@ define([
me.paragraphControls.push(me.btnLineSpace); me.paragraphControls.push(me.btnLineSpace);
me.btnInsertTable = new Common.UI.Button({ me.btnInsertTable = new Common.UI.Button({
id : 'id-toolbar-btn-inserttable', id : 'tlbtn-inserttable',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserttable', iconCls : 'btn-inserttable',
caption : me.capInsertTable, caption : me.capInsertTable,
@ -552,7 +552,7 @@ define([
me.slideOnlyControls.push(me.btnInsertTable); me.slideOnlyControls.push(me.btnInsertTable);
me.btnInsertChart = new Common.UI.Button({ me.btnInsertChart = new Common.UI.Button({
id : 'id-toolbar-btn-insertchart', id : 'tlbtn-insertchart',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertchart', iconCls : 'btn-insertchart',
caption : me.capInsertChart, caption : me.capInsertChart,
@ -567,7 +567,7 @@ define([
me.slideOnlyControls.push(me.btnInsertChart); me.slideOnlyControls.push(me.btnInsertChart);
me.btnInsertEquation = new Common.UI.Button({ me.btnInsertEquation = new Common.UI.Button({
id : 'id-toolbar-btn-insertequation', id : 'tlbtn-insertequation',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertequation', iconCls : 'btn-insertequation',
caption : me.capInsertEquation, caption : me.capInsertEquation,
@ -578,7 +578,7 @@ define([
me.slideOnlyControls.push(this.btnInsertEquation); me.slideOnlyControls.push(this.btnInsertEquation);
me.btnInsertHyperlink = new Common.UI.Button({ me.btnInsertHyperlink = new Common.UI.Button({
id : 'id-toolbar-btn-inserthyperlink', id : 'tlbtn-insertlink',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserthyperlink', iconCls : 'btn-inserthyperlink',
caption : me.capInsertHyperlink, caption : me.capInsertHyperlink,
@ -587,7 +587,7 @@ define([
me.paragraphControls.push(me.btnInsertHyperlink); me.paragraphControls.push(me.btnInsertHyperlink);
me.btnInsertTextArt = new Common.UI.Button({ me.btnInsertTextArt = new Common.UI.Button({
id: 'tlb-btn-instextart', id: 'tlbtn-inserttextart',
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-textart', iconCls: 'btn-textart',
caption: me.capInsertTextArt, caption: me.capInsertTextArt,
@ -1006,7 +1006,10 @@ define([
function _injectBtns(opts) { function _injectBtns(opts) {
var array = new buttonsArray; var array = new buttonsArray;
var $slots = $host.find(opts.slot); var $slots = $host.find(opts.slot);
var id = opts.btnconfig.id;
$slots.each(function(index, el) { $slots.each(function(index, el) {
if ( !!id ) opts.btnconfig.id = id + index;
var button = new Common.UI.Button(opts.btnconfig); var button = new Common.UI.Button(opts.btnconfig);
button.render( $slots.eq(index) ); button.render( $slots.eq(index) );
@ -1020,6 +1023,7 @@ define([
me.btnsInsertImage = _injectBtns({ me.btnsInsertImage = _injectBtns({
slot: '.slot-insertimg', slot: '.slot-insertimg',
btnconfig: { btnconfig: {
id : 'tlbtn-insertimage-',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertimage', iconCls : 'btn-insertimage',
caption : me.capInsertImage, caption : me.capInsertImage,
@ -1031,6 +1035,7 @@ define([
me.btnsInsertText = _injectBtns({ me.btnsInsertText = _injectBtns({
slot: '.slot-instext', slot: '.slot-instext',
btnconfig: { btnconfig: {
id : 'tlbtn-inserttext-',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text', iconCls : 'btn-text',
caption : me.capInsertText, caption : me.capInsertText,
@ -1042,6 +1047,7 @@ define([
me.btnsInsertShape = _injectBtns({ me.btnsInsertShape = _injectBtns({
slot: '.slot-insertshape', slot: '.slot-insertshape',
btnconfig: { btnconfig: {
id : 'tlbtn-insertshape-',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertshape', iconCls : 'btn-insertshape',
caption : me.capInsertShape, caption : me.capInsertShape,

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

@ -2920,6 +2920,7 @@ define([
/x-huge/.test(el.className) && (_cls += ' x-huge icon-top'); /x-huge/.test(el.className) && (_cls += ' x-huge icon-top');
var button = new Common.UI.Button({ var button = new Common.UI.Button({
id: 'tlbtn-addcomment-' + index,
cls: _cls, cls: _cls,
iconCls: 'btn-menu-comments', iconCls: 'btn-menu-comments',
lock: [_set.lostConnect, _set.commentLock], lock: [_set.lostConnect, _set.commentLock],

14
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -601,7 +601,7 @@ define([
}); });
me.btnInsertImage = new Common.UI.Button({ me.btnInsertImage = new Common.UI.Button({
id : 'id-toolbar-btn-insertimage', id : 'tlbtn-insertimage',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertimage', iconCls : 'btn-insertimage',
caption : me.capInsertImage, caption : me.capInsertImage,
@ -615,7 +615,7 @@ define([
}); });
me.btnInsertHyperlink = new Common.UI.Button({ me.btnInsertHyperlink = new Common.UI.Button({
id : 'id-toolbar-btn-inserthyperlink', id : 'tlbtn-insertlink',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-inserthyperlink', iconCls : 'btn-inserthyperlink',
caption : me.capInsertHyperlink, caption : me.capInsertHyperlink,
@ -623,7 +623,7 @@ define([
}); });
me.btnInsertChart = new Common.UI.Button({ me.btnInsertChart = new Common.UI.Button({
id : 'id-toolbar-btn-insertchart', id : 'tlbtn-insertchart',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertchart', iconCls : 'btn-insertchart',
lock : [_set.editCell, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText], lock : [_set.editCell, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth, _set.coAuthText],
@ -637,7 +637,7 @@ define([
}); });
me.btnInsertShape = new Common.UI.Button({ me.btnInsertShape = new Common.UI.Button({
id : 'id-toolbar-btn-insertshape', id : 'tlbtn-insertshape',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertshape', iconCls : 'btn-insertshape',
enableToggle: true, enableToggle: true,
@ -647,7 +647,7 @@ define([
}); });
me.btnInsertText = new Common.UI.Button({ me.btnInsertText = new Common.UI.Button({
id : 'tlb-btn-inserttext', id : 'tlbtn-inserttext',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-text', iconCls : 'btn-text',
caption : me.capInsertText, caption : me.capInsertText,
@ -656,7 +656,7 @@ define([
}); });
me.btnInsertTextArt = new Common.UI.Button({ me.btnInsertTextArt = new Common.UI.Button({
id : 'tlb-btn-instextart', id : 'tlbtn-inserttextart',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-textart', iconCls : 'btn-textart',
caption : me.capInsertTextart, caption : me.capInsertTextart,
@ -670,7 +670,7 @@ define([
}); });
me.btnInsertEquation = new Common.UI.Button({ me.btnInsertEquation = new Common.UI.Button({
id : 'id-toolbar-btn-insertequation', id : 'tlbtn-insertequation',
cls : 'btn-toolbar x-huge icon-top', cls : 'btn-toolbar x-huge icon-top',
iconCls : 'btn-insertequation', iconCls : 'btn-insertequation',
caption : me.capInsertEquation, caption : me.capInsertEquation,