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

mobile: restore calc background quick-toolbar button & fix typo.

Browse source 
Change-Id: Ieae15188113cd646bb3fe9be7747308a95857569
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/86709
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
This commit is contained in:
Michael Meeks 2020-01-13 17:56:48 +00:00
parent 84ef6bd6fb
commit f5d159b80b
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
loleaflet/src/control/Control.Toolbar.js
View file

@ -720,15 +720,14 @@ function insertShapes(mobile) {
function getColorPickerData(type) {
var uno;
if (type === 'Font Color') {
if (map.getDocType() === 'spreadsheet')
uno = '.uno:Color';
else if (map.getDocType() === 'presentation')
if (map.getDocType() === 'spreadsheet' ||
map.getDocType() === 'presentation')
uno = '.uno:Color';
else
uno = '.uno:FontColor';
} else if (type === 'Highlight Color') {
if (map.getDocType() === 'spreadsheet')
uno = '.uno:BacgroundColor';
uno = '.uno:BackgroundColor';
else if (map.getDocType() === 'presentation')
uno = '.uno:CharBackColor';
else

2
loleaflet/src/layer/tile/CalcTileLayer.js
View file

@ -80,7 +80,7 @@ L.CalcTileLayer = L.TileLayer.extend({
{type: 'button', id: 'strikeout', img: 'strikeout', hint: _UNO('.uno:Strikeout'), uno: 'Strikeout'},
{type: 'break'},
{type: 'button', id: 'fontcolor', img: 'textcolor', hint: _UNO('.uno:FontColor')},
// {type: 'color', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')},
{type: 'button', id: 'backcolor', img: 'backcolor', hint: _UNO('.uno:BackgroundColor')},
{type: 'button', id: 'togglemergecells', img: 'togglemergecells', hint: _UNO('.uno:ToggleMergeCells', 'spreadsheet', true), uno: 'ToggleMergeCells', disabled: true},
// {type: 'break', id: 'breakmergecells'},
{type: 'break'},