loleaflet/js/toolbar.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
New commits:
commit e0e55832d0f21fa7dadaca378c551a7ec28ee90c
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Sat Dec 8 00:04:20 2018 +0100
Commit: Jan Holesovsky <ke...@collabora.com>
CommitDate: Sat Dec 8 00:08:17 2018 +0100
ui: Unfortunately we have to start with the 'styles' visible even in calc.
The 'hidden: true' is causing trouble, just toolbarUp.show('styles') is
not enough to make them visible ex-post, so for the moment, default to
visible.
Change-Id: If49bcaea3813ae9bcb299b8ab70750d32986a3fe
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 1c666be88..851b3c948 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -725,7 +725,7 @@ function createToolbar() {
e.item.html = undefined;
}});
}
- }, mobile: false, hidden: true },
+ }, mobile: false },
{type: 'html', id: 'fonts',
html: '<select class="fonts-select"><option>Liberation
Sans</option></select>',
onRefresh: function (edata) {
@@ -1574,6 +1574,8 @@ function onDocLayerInit() {
toolbarUp.show('textalign', 'wraptext', 'breakspacing',
'insertannotation', 'numberformatcurrency', 'numberformatpercent',
'numberformatincdecimals', 'numberformatdecdecimals',
'insertobjectchart', 'sum', 'break-number',
'setborderstyle');
+ toolbarUp.remove('styles');
+
statusbar.remove('prev', 'next', 'prevnextbreak');
toolbarUp.set('zoom', {
@@ -1621,7 +1623,7 @@ function onDocLayerInit() {
break;
case 'text':
- toolbarUp.show('styles', 'leftpara', 'centerpara', 'rightpara',
'justifypara', 'breakpara', 'linespacing',
+ toolbarUp.show('leftpara', 'centerpara', 'rightpara',
'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering',
'breakbullet', 'incrementindent', 'decrementindent',
'breakindent', 'inserttable', 'insertannotation');
@@ -1667,7 +1669,7 @@ function onDocLayerInit() {
}
// FALLTHROUGH intended
case 'drawing':
- toolbarUp.show('styles', 'leftpara', 'centerpara', 'rightpara',
'justifypara', 'breakpara', 'linespacing',
+ toolbarUp.show('leftpara', 'centerpara', 'rightpara',
'justifypara', 'breakpara', 'linespacing',
'breakspacing', 'defaultbullet', 'defaultnumbering',
'breakbullet', 'inserttable');
$('#presentation-toolbar').show();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
