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

[DE SSE] removed unused buttons

Browse source
This commit is contained in:
Maxim Kadushkin 2019-11-20 17:58:55 +03:00
parent fa5c9d5626
commit 5238c494ae
6 changed files with 5 additions and 228 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -264,7 +264,6 @@ define([
toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, 2)); toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, 2));
toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, 0)); toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, 0));
toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, 3)); toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, 3));
toolbar.btnHorizontalAlign.menu.on('item:click', _.bind(this.onMenuHorizontalAlignSelect, this));
toolbar.btnDecLeftOffset.on('click', _.bind(this.onDecOffset, this)); toolbar.btnDecLeftOffset.on('click', _.bind(this.onDecOffset, this));
toolbar.btnIncLeftOffset.on('click', _.bind(this.onIncOffset, this)); toolbar.btnIncLeftOffset.on('click', _.bind(this.onIncOffset, this));
toolbar.btnMarkers.on('click', _.bind(this.onMarkers, this)); toolbar.btnMarkers.on('click', _.bind(this.onMarkers, this));
@ -541,18 +540,6 @@ define([
case 3: index = 3; align = 'btn-align-just'; break; case 3: index = 3; align = 'btn-align-just'; break;
default: index = -255; align = 'btn-align-left'; break; default: index = -255; align = 'btn-align-left'; break;
} }
if (!(index < 0)) {
this.toolbar.btnHorizontalAlign.menu.items[index].setChecked(true);
} else if (index == -255) {
this.toolbar.btnHorizontalAlign.menu.clearAll();
}
var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
if ( btnHorizontalAlign.rendered && btnHorizontalAlign.$icon ) {
btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align);
btnHorizontalAlign.options.icls = align;
}
if (v === null || v===undefined) { if (v === null || v===undefined) {
toolbar.btnAlignRight.toggle(false, true); toolbar.btnAlignRight.toggle(false, true);
@ -1143,20 +1130,6 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Align'); Common.component.Analytics.trackEvent('ToolBar', 'Align');
}, },
onMenuHorizontalAlignSelect: function(menu, item) {
this._state.pralign = undefined;
var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls);
btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls);
if (this.api && item.checked)
this.api.put_PrAlign(item.value);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Horizontal Align');
},
onMarkers: function(btn, e) { onMarkers: function(btn, e) {
var record = { var record = {

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

@ -329,51 +329,6 @@ define([
}); });
this.paragraphControls.push(this.btnAlignJust); this.paragraphControls.push(this.btnAlignJust);
this.btnHorizontalAlign = new Common.UI.Button({
id: 'id-toolbar-btn-halign',
cls: 'btn-toolbar',
iconCls: 'btn-align-left',
icls: 'btn-align-left',
menu: new Common.UI.Menu({
cls: 'ppm-toolbar',
items: [
{
caption: this.tipAlignLeft + Common.Utils.String.platformKey('Ctrl+L'),
iconCls: 'mnu-align-left',
icls: 'btn-align-left',
checkable: true,
toggleGroup: 'halignGroup',
checked: true,
value: 1
},
{
caption: this.tipAlignCenter + Common.Utils.String.platformKey('Ctrl+E'),
iconCls: 'mnu-align-center',
icls: 'btn-align-center',
checkable: true,
toggleGroup: 'halignGroup',
value: 2
},
{
caption: this.tipAlignRight + Common.Utils.String.platformKey('Ctrl+R'),
iconCls: 'mnu-align-right',
icls: 'btn-align-right',
checkable: true,
toggleGroup: 'halignGroup',
value: 0
},
{
caption: this.tipAlignJust + Common.Utils.String.platformKey('Ctrl+J'),
iconCls: 'mnu-align-just',
icls: 'btn-align-just',
checkable: true,
toggleGroup: 'halignGroup',
value: 3
}
]
})
});
this.paragraphControls.push(this.btnHorizontalAlign);
this.btnDecLeftOffset = new Common.UI.Button({ this.btnDecLeftOffset = new Common.UI.Button({
id: 'id-toolbar-btn-decoffset', id: 'id-toolbar-btn-decoffset',
@ -1317,7 +1272,6 @@ define([
_injectComponent('#slot-btn-colorschemas', this.btnColorSchemas); _injectComponent('#slot-btn-colorschemas', this.btnColorSchemas);
_injectComponent('#slot-btn-paracolor', this.btnParagraphColor); _injectComponent('#slot-btn-paracolor', this.btnParagraphColor);
_injectComponent('#slot-field-styles', this.listStyles); _injectComponent('#slot-field-styles', this.listStyles);
_injectComponent('#slot-btn-halign', this.btnHorizontalAlign);
_injectComponent('#slot-btn-mailrecepients', this.btnMailRecepients); _injectComponent('#slot-btn-mailrecepients', this.btnMailRecepients);
_injectComponent('#slot-img-align', this.btnImgAlign); _injectComponent('#slot-img-align', this.btnImgAlign);
_injectComponent('#slot-img-group', this.btnImgGroup); _injectComponent('#slot-img-group', this.btnImgGroup);
@ -1562,7 +1516,6 @@ define([
this.btnAlignCenter.updateHint(this.tipAlignCenter + Common.Utils.String.platformKey('Ctrl+E')); this.btnAlignCenter.updateHint(this.tipAlignCenter + Common.Utils.String.platformKey('Ctrl+E'));
this.btnAlignRight.updateHint(this.tipAlignRight + Common.Utils.String.platformKey('Ctrl+R')); this.btnAlignRight.updateHint(this.tipAlignRight + Common.Utils.String.platformKey('Ctrl+R'));
this.btnAlignJust.updateHint(this.tipAlignJust + Common.Utils.String.platformKey('Ctrl+J')); this.btnAlignJust.updateHint(this.tipAlignJust + Common.Utils.String.platformKey('Ctrl+J'));
this.btnHorizontalAlign.updateHint(this.tipHAligh);
this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M')); this.btnDecLeftOffset.updateHint(this.tipDecPrLeft + Common.Utils.String.platformKey('Ctrl+Shift+M'));
this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M')); this.btnIncLeftOffset.updateHint(this.tipIncPrLeft + Common.Utils.String.platformKey('Ctrl+M'));
this.btnLineSpace.updateHint(this.tipLineSpace); this.btnLineSpace.updateHint(this.tipLineSpace);
@ -2200,7 +2153,6 @@ define([
tipColorSchemas: 'Change Color Scheme', tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text', tipInsertText: 'Insert Text',
tipInsertTextArt: 'Insert Text Art', tipInsertTextArt: 'Insert Text Art',
tipHAligh: 'Horizontal Align',
mniEditDropCap: 'Drop Cap Settings', mniEditDropCap: 'Drop Cap Settings',
textNone: 'None', textNone: 'None',
textInText: 'In Text', textInText: 'In Text',

2
apps/documenteditor/main/locale/en.json
View file

@ -2175,7 +2175,7 @@
"DE.Views.Toolbar.tipFontColor": "Font color", "DE.Views.Toolbar.tipFontColor": "Font color",
"DE.Views.Toolbar.tipFontName": "Font", "DE.Views.Toolbar.tipFontName": "Font",
"DE.Views.Toolbar.tipFontSize": "Font size", "DE.Views.Toolbar.tipFontSize": "Font size",
"DE.Views.Toolbar.tipHAligh": "Horizontal Align", "del_DE.Views.Toolbar.tipHAligh": "Horizontal Align",
"DE.Views.Toolbar.tipHighlightColor": "Highlight color", "DE.Views.Toolbar.tipHighlightColor": "Highlight color",
"DE.Views.Toolbar.tipImgAlign": "Align objects", "DE.Views.Toolbar.tipImgAlign": "Align objects",
"DE.Views.Toolbar.tipImgGroup": "Group objects", "DE.Views.Toolbar.tipImgGroup": "Group objects",

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

@ -308,8 +308,6 @@ define([
toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Center)); toolbar.btnAlignCenter.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Center));
toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Right)); toolbar.btnAlignRight.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Right));
toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Justify)); toolbar.btnAlignJust.on('click', _.bind(this.onHorizontalAlign, this, AscCommon.align_Justify));
toolbar.btnHorizontalAlign.menu.on('item:click', _.bind(this.onHorizontalAlignMenu, this));
toolbar.btnVerticalAlign.menu.on('item:click', _.bind(this.onVerticalAlignMenu, this));
toolbar.btnMerge.on('click', _.bind(this.onMergeCellsMenu, this, toolbar.btnMerge.menu, toolbar.btnMerge.menu.items[0])); toolbar.btnMerge.on('click', _.bind(this.onMergeCellsMenu, this, toolbar.btnMerge.menu, toolbar.btnMerge.menu.items[0]));
toolbar.btnMerge.menu.on('item:click', _.bind(this.onMergeCellsMenu, this)); toolbar.btnMerge.menu.on('item:click', _.bind(this.onMergeCellsMenu, this));
toolbar.btnAlignTop.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Top)); toolbar.btnAlignTop.on('click', _.bind(this.onVerticalAlign, this, Asc.c_oAscVAlign.Top));
@ -715,38 +713,6 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Horizontal align'); Common.component.Analytics.trackEvent('ToolBar', 'Horizontal align');
}, },
onHorizontalAlignMenu: function(menu, item) {
var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls);
btnHorizontalAlign.options.icls = !item.checked ? 'btn-align-left' : item.options.icls;
btnHorizontalAlign.$icon.addClass(btnHorizontalAlign.options.icls);
this._state.pralign = undefined;
if (this.api)
this.api.asc_setCellAlign(!item.checked ? null : item.value);
this.toolbar.btnWrap.allowDepress = !(item.value == AscCommon.align_Justify);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Horizontal Align');
},
onVerticalAlignMenu: function(menu, item) {
var btnVerticalAlign = this.toolbar.btnVerticalAlign;
btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls);
btnVerticalAlign.options.icls = !item.checked ? 'btn-valign-bottom' : item.options.icls;
btnVerticalAlign.$icon.addClass(btnVerticalAlign.options.icls);
this._state.valign = undefined;
if (this.api)
this.api.asc_setCellVertAlign(!item.checked ? Asc.c_oAscVAlign.Bottom : item.value);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Vertical Align');
},
onVerticalAlign: function(type, btn, e) { onVerticalAlign: function(type, btn, e) {
this._state.valign = undefined; this._state.valign = undefined;
if (this.api) { if (this.api) {
@ -2210,20 +2176,11 @@ define([
toolbar.btnAlignLeft.toggle(index===0, true); toolbar.btnAlignLeft.toggle(index===0, true);
toolbar.btnAlignCenter.toggle(index===1, true); toolbar.btnAlignCenter.toggle(index===1, true);
toolbar.btnAlignJust.toggle(index===3, true); toolbar.btnAlignJust.toggle(index===3, true);
toolbar.btnHorizontalAlign.menu.items[index].setChecked(true, false);
} else if (index == -255) { } else if (index == -255) {
toolbar.btnAlignRight.toggle(false, true); toolbar.btnAlignRight.toggle(false, true);
toolbar.btnAlignLeft.toggle(false, true); toolbar.btnAlignLeft.toggle(false, true);
toolbar.btnAlignCenter.toggle(false, true); toolbar.btnAlignCenter.toggle(false, true);
toolbar.btnAlignJust.toggle(false, true); toolbar.btnAlignJust.toggle(false, true);
toolbar.btnHorizontalAlign.menu.clearAll();
}
var btnHorizontalAlign = this.toolbar.btnHorizontalAlign;
if ( btnHorizontalAlign.rendered ) {
btnHorizontalAlign.$icon.removeClass(btnHorizontalAlign.options.icls).addClass(align);
btnHorizontalAlign.options.icls = align;
} }
} }
@ -2248,13 +2205,6 @@ define([
toolbar.btnAlignTop.toggle(index===0, true); toolbar.btnAlignTop.toggle(index===0, true);
toolbar.btnAlignMiddle.toggle(index===1, true); toolbar.btnAlignMiddle.toggle(index===1, true);
toolbar.btnAlignBottom.toggle(index===2, true); toolbar.btnAlignBottom.toggle(index===2, true);
toolbar.btnVerticalAlign.menu.items[index].setChecked(true, false);
var btnVerticalAlign = this.toolbar.btnVerticalAlign;
if ( btnVerticalAlign.rendered ) {
btnVerticalAlign.$icon.removeClass(btnVerticalAlign.options.icls).addClass(align);
btnVerticalAlign.options.icls = align;
}
} }
} }

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

@ -1011,97 +1011,6 @@ define([
}) })
}); });
// Is unique for the short view
me.btnHorizontalAlign = new Common.UI.Button({
id : 'id-toolbar-btn-halign',
cls : 'btn-toolbar',
iconCls : 'btn-align-left',
icls : 'btn-align-left',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
caption : me.tipAlignLeft,
iconCls : 'mnu-align-left',
icls : 'btn-align-left',
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
checked : true,
value : AscCommon.align_Left
},
{
caption : me.tipAlignCenter,
iconCls : 'mnu-align-center',
icls : 'btn-align-center',
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : AscCommon.align_Center
},
{
caption : me.tipAlignRight,
iconCls : 'mnu-align-right',
icls : 'btn-align-right',
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : AscCommon.align_Right
},
{
caption : me.tipAlignJust,
iconCls : 'mnu-align-just',
icls : 'btn-align-just',
checkable : true,
allowDepress: true,
toggleGroup : 'halignGroup',
value : AscCommon.align_Justify
}
]
})
});
me.btnVerticalAlign = new Common.UI.Button({
id : 'id-toolbar-btn-valign',
cls : 'btn-toolbar',
iconCls : 'btn-valign-bottom',
icls : 'btn-valign-bottom',
lock : [_set.editCell, _set.selChart, _set.selChartText, _set.lostConnect, _set.coAuth, _set.coAuthText],
menu : new Common.UI.Menu({
items: [
{
caption : me.tipAlignTop,
iconCls : 'mnu-valign-top',
icls : 'btn-valign-top',
checkable : true,
allowDepress: true,
toggleGroup : 'valignGroup',
value : Asc.c_oAscVAlign.Top
},
{
caption : me.tipAlignMiddle,
iconCls : 'mnu-valign-middle',
icls : 'btn-valign-middle',
checkable : true,
allowDepress: true,
toggleGroup : 'valignGroup',
value : Asc.c_oAscVAlign.Center
},
{
caption : me.tipAlignBottom,
iconCls : 'mnu-valign-bottom',
icls : 'btn-valign-bottom',
checkable : true,
allowDepress: true,
checked : true,
toggleGroup : 'valignGroup',
value : Asc.c_oAscVAlign.Bottom
}
]
})
});
var hidetip = Common.localStorage.getItem("sse-hide-synch"); var hidetip = Common.localStorage.getItem("sse-hide-synch");
me.showSynchTip = !(hidetip && parseInt(hidetip) == 1); me.showSynchTip = !(hidetip && parseInt(hidetip) == 1);
// me.needShowSynchTip = false; // me.needShowSynchTip = false;
@ -1439,8 +1348,8 @@ define([
if (config.isEdit) { if (config.isEdit) {
me.lockControls = [ me.lockControls = [
me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold, me.cmbFontName, me.cmbFontSize, me.btnIncFontSize, me.btnDecFontSize, me.btnBold,
me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnHorizontalAlign, me.btnAlignLeft, me.btnItalic, me.btnUnderline, me.btnStrikeout, me.btnSubscript, me.btnTextColor, me.btnAlignLeft,
me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnVerticalAlign, me.btnAlignTop, me.btnAlignCenter,me.btnAlignRight,me.btnAlignJust, me.btnAlignTop,
me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable, me.btnAlignMiddle, me.btnAlignBottom, me.btnWrap, me.btnTextOrient, me.btnBackColor, me.btnInsertTable,
me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation, me.btnMerge, me.btnInsertFormula, me.btnNamedRange, me.btnIncDecimal, me.btnInsertShape, me.btnInsertEquation,
me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter, me.btnInsertText, me.btnInsertTextArt, me.btnSortUp, me.btnSortDown, me.btnSetAutofilter, me.btnClearAutofilter,
@ -1651,9 +1560,6 @@ define([
[SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]); [SSE.enumLock.editCell, SSE.enumLock.selRangeEdit, SSE.enumLock.headerLock, SSE.enumLock.lostConnect, SSE.enumLock.coAuth]);
Array.prototype.push.apply(this.lockControls, this.btnsEditHeader); Array.prototype.push.apply(this.lockControls, this.btnsEditHeader);
// replacePlacholder('#id-toolbar-short-placeholder-btn-halign', this.btnHorizontalAlign);
// replacePlacholder('#id-toolbar-short-placeholder-btn-valign', this.btnVerticalAlign);
return $host; return $host;
}, },
@ -1716,8 +1622,6 @@ define([
_updateHint(this.btnAddCell, this.tipInsertOpt); _updateHint(this.btnAddCell, this.tipInsertOpt);
_updateHint(this.btnDeleteCell, this.tipDeleteOpt); _updateHint(this.btnDeleteCell, this.tipDeleteOpt);
_updateHint(this.btnColorSchemas, this.tipColorSchemas); _updateHint(this.btnColorSchemas, this.tipColorSchemas);
_updateHint(this.btnHorizontalAlign, this.tipHAligh);
_updateHint(this.btnVerticalAlign, this.tipVAligh);
_updateHint(this.btnPageOrient, this.tipPageOrient); _updateHint(this.btnPageOrient, this.tipPageOrient);
_updateHint(this.btnPageSize, this.tipPageSize); _updateHint(this.btnPageSize, this.tipPageSize);
_updateHint(this.btnPageMargins, this.tipPageMargins); _updateHint(this.btnPageMargins, this.tipPageMargins);
@ -2277,8 +2181,6 @@ define([
tipClearStyle: 'Clear', tipClearStyle: 'Clear',
tipCopyStyle: 'Copy Style', tipCopyStyle: 'Copy Style',
tipBack: 'Back', tipBack: 'Back',
tipHAligh: 'Horizontal Align',
tipVAligh: 'Vertical Align',
tipAlignLeft: 'Align Left', tipAlignLeft: 'Align Left',
tipAlignRight: 'Align Right', tipAlignRight: 'Align Right',
tipAlignCenter: 'Align Center', tipAlignCenter: 'Align Center',

4
apps/spreadsheeteditor/main/locale/en.json
View file

@ -2304,7 +2304,7 @@
"SSE.Views.Toolbar.tipFontColor": "Font color", "SSE.Views.Toolbar.tipFontColor": "Font color",
"SSE.Views.Toolbar.tipFontName": "Font", "SSE.Views.Toolbar.tipFontName": "Font",
"SSE.Views.Toolbar.tipFontSize": "Font size", "SSE.Views.Toolbar.tipFontSize": "Font size",
"SSE.Views.Toolbar.tipHAligh": "Horizontal Alignment", "del_SSE.Views.Toolbar.tipHAligh": "Horizontal Alignment",
"SSE.Views.Toolbar.tipImgAlign": "Align objects", "SSE.Views.Toolbar.tipImgAlign": "Align objects",
"SSE.Views.Toolbar.tipImgGroup": "Group objects", "SSE.Views.Toolbar.tipImgGroup": "Group objects",
"SSE.Views.Toolbar.tipIncDecimal": "Increase decimal", "SSE.Views.Toolbar.tipIncDecimal": "Increase decimal",
@ -2336,7 +2336,7 @@
"SSE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.", "SSE.Views.Toolbar.tipSynchronize": "The document has been changed by another user. Please click to save your changes and reload the updates.",
"SSE.Views.Toolbar.tipTextOrientation": "Orientation", "SSE.Views.Toolbar.tipTextOrientation": "Orientation",
"SSE.Views.Toolbar.tipUndo": "Undo", "SSE.Views.Toolbar.tipUndo": "Undo",
"SSE.Views.Toolbar.tipVAligh": "Vertical Alignment", "del_SSE.Views.Toolbar.tipVAligh": "Vertical Alignment",
"SSE.Views.Toolbar.tipWrap": "Wrap text", "SSE.Views.Toolbar.tipWrap": "Wrap text",
"SSE.Views.Toolbar.txtAccounting": "Accounting", "SSE.Views.Toolbar.txtAccounting": "Accounting",
"SSE.Views.Toolbar.txtAdditional": "Additional", "SSE.Views.Toolbar.txtAdditional": "Additional",