strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

loleaflet: Make things simpler - use separate cell alignment commands

Browse source 
... instead of using HorizontalAlignment command with different
parameters to do a cell alignment. The state change events for
that would add further complexity here. Lets keep using separate
UNO commands for alignment.

Additonally, change a typo, 'alignblock' -> 'justifypara' when
hiding the toolbar buttons on 'doclayerinit' event - we don't
want to show justify alignment button for spreadsheets.

Change-Id: Iaf7406af9e3172b3fa9d41b3dac6d1e2677f0db8
This commit is contained in:
Pranav Kant 2017-01-21 17:24:16 +05:30
parent 8c5028de05
commit 4030795584
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
loleaflet/dist/toolbar/toolbar.js vendored
View file

@ -489,10 +489,10 @@ $(function () {
{type: 'html', id: 'backcolor-html', html: '<div id="backcolor-wrapper"><input id="backColorPicker" style="display:none;"></div>'}, {type: 'html', id: 'backcolor-html', html: '<div id="backcolor-wrapper"><input id="backColorPicker" style="display:none;"></div>'},
{type: 'button', id: 'backcolor', img: 'backcolor', hint: _('Highlighting')}, {type: 'button', id: 'backcolor', img: 'backcolor', hint: _('Highlighting')},
{type: 'break'}, {type: 'break'},
{type: 'button', id: 'leftpara', img: 'alignleft', hint: _('Align left'), uno: 'LeftPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"1"}}'}, {type: 'button', id: 'leftpara', img: 'alignleft', hint: _('Align left'), uno: 'LeftPara', unosheet: 'AlignLeft'},
{type: 'button', id: 'centerpara', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"2"}}'}, {type: 'button', id: 'centerpara', img: 'alignhorizontal', hint: _('Center horizontally'), uno: 'CenterPara', unosheet: 'AlignHorizontalCenter'},
{type: 'button', id: 'rightpara', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"3"}}'}, {type: 'button', id: 'rightpara', img: 'alignright', hint: _('Align right'), uno: 'RightPara', unosheet: 'AlignRight'},
{type: 'button', id: 'justifypara', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: 'HorizontalAlignment {"HorizontalAlignment":{"type":"unsigned short", "value":"4"}}'}, {type: 'button', id: 'justifypara', img: 'alignblock', hint: _('Justified'), uno: 'JustifyPara', unosheet: ''},
{type: 'break', id: 'wraptextseparator'}, {type: 'break', id: 'wraptextseparator'},
{type: 'button', id: 'wraptext', img: 'wraptext', hint: _('Wrap Text'), uno: 'WrapText'}, {type: 'button', id: 'wraptext', img: 'wraptext', hint: _('Wrap Text'), uno: 'WrapText'},
{type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'}, {type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _('Merge and Center Cells'), uno: 'ToggleMergeCells'},
@ -717,7 +717,23 @@ function toLocalePattern (pattern, regex, text, sub1, sub2) {
function unoCmdToToolbarId(commandname) function unoCmdToToolbarId(commandname)
{ {
return commandname.toLowerCase().substr(5); var id = commandname.toLowerCase().substr(5);
if (map.getDocType() === 'spreadsheet') {
switch (id) {
case 'alignleft':
id = 'leftpara';
break;
case 'alignhorizontalcenter':
id = 'centerpara';
break;
case 'alignright':
id = 'rightpara';
break;
default:
id = null;
}
}
return id;
} }
function selectItem(item, func) function selectItem(item, func)
@ -931,8 +947,8 @@ map.on('doclayerinit', function () {
switch (docType) { switch (docType) {
case 'spreadsheet': case 'spreadsheet':
toolbarUp.remove('inserttable', 'styles', 'alignblock', 'defaultbullet', 'defaultnumbering', 'break-numbering'); toolbarUp.remove('inserttable', 'styles', 'justifypara', 'defaultbullet', 'defaultnumbering', 'break-numbering');
toolbarUpMore.remove('inserttable', 'styles', 'alignblock', 'defaultbullet', 'defaultnumbering', 'break-numbering'); toolbarUpMore.remove('inserttable', 'styles', 'justifypara', 'defaultbullet', 'defaultnumbering', 'break-numbering');
statusbar.disable('zoomreset', 'zoomout', 'zoomin', 'zoomlevel'); statusbar.disable('zoomreset', 'zoomout', 'zoomin', 'zoomlevel');
statusbar.insert('left', [ statusbar.insert('left', [
{type: 'break', id:'break1'}, {type: 'break', id:'break1'},