[Libreoffice-commits] online.git: loleaflet/js

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4f5aced8233cbbf49348b342da43f109d60b2e9a
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Mon Feb 4 19:00:07 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Tue Feb 5 13:59:51 2019 +0100

    conditional formatting: Enable the toolbar button in calc.
    
    Change-Id: I7191d367f8cb95e087b8e4899e94d4d241b9fae3
    Reviewed-on: https://gerrit.libreoffice.org/67375
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index aa834b88d..f6ff83e6b 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1574,7 +1574,8 @@ function onDocLayerInit() {
 
 	switch (docType) {
 	case 'spreadsheet':
-		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'numberformatcurrency', 'numberformatpercent',
+		toolbarUp.show('textalign', 'wraptext', 'breakspacing', 'insertannotation', 'conditionalformaticonset',
+			'numberformatcurrency', 'numberformatpercent',
 			'numberformatincdecimals', 'numberformatdecdecimals', 'break-number',
 			'setborderstyle');
 		toolbarUp.remove('styles');