[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/dist

[Jan Holesovsky]

 loleaflet/dist/toolbar.css        |    2 ++
 loleaflet/dist/toolbar/toolbar.js |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d532125d936631899fcf3acc81b1ce80b20bf444
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Thu Jun 28 21:33:34 2018 +0200

    Cell borders: Implement the 'More...' button.
    
    Change-Id: I3551cec69cf1e4dca02c0fcdbee23a4e06b1e36a
    Reviewed-on: https://gerrit.libreoffice.org/56634
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loleaflet/dist/toolbar.css b/loleaflet/dist/toolbar.css
index 4ebcb4a90..b730bb829 100644
--- a/loleaflet/dist/toolbar.css
+++ b/loleaflet/dist/toolbar.css
@@ -269,6 +269,8 @@ button.leaflet-control-search-next
 .w2ui-icon.frame10 { background: url('../images/fr010.svg') no-repeat center !important; }
 .w2ui-icon.frame11 { background: url('../images/fr011.svg') no-repeat center !important; }
 .w2ui-icon.frame12 { background: url('../images/fr012.svg') no-repeat center !important; }
+.w2ui-icon.frame13 { width: 108px !important; }
+#div-frame13 { width: 102px; height: 18px; text-align: center; display: table-cell; vertical-align: middle; cursor: default; }
 
 #setborderstyle-grid tr td {
     box-sizing: border-box;
diff --git a/loleaflet/dist/toolbar/toolbar.js b/loleaflet/dist/toolbar/toolbar.js
index de360832b..a042289dc 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -272,6 +272,8 @@ function setBorders(left, right, bottom, top, horiz, vert) {
 
 function setBorderStyle(num) {
 	switch (num) {
+	case 0: map.sendUnoCommand('.uno:FormatCellBorders'); break;
+
 	case 1: setBorders(0, 0, 0, 0, 0, 0); break;
 	case 2: setBorders(1, 0, 0, 0, 0, 0); break;
 	case 3: setBorders(0, 1, 0, 0, 0, 0); break;
@@ -464,7 +466,8 @@ $(function () {
 				      '<td class="w2ui-tb-image w2ui-icon frame06" onclick="setBorderStyle(6)"></td><td class="w2ui-tb-image w2ui-icon frame07" onclick="setBorderStyle(7)"></td>' +
 				      '<td class="w2ui-tb-image w2ui-icon frame08" onclick="setBorderStyle(8)"></td></tr><tr><td class="w2ui-tb-image w2ui-icon frame09" onclick="setBorderStyle(9)"></td>' +
 				      '<td class="w2ui-tb-image w2ui-icon frame10" onclick="setBorderStyle(10)"></td><td class="w2ui-tb-image w2ui-icon frame11" onclick="setBorderStyle(11)"></td>' +
-				      '<td class="w2ui-tb-image w2ui-icon frame12" onclick="setBorderStyle(12)"></td></tr></table>'
+				      '<td class="w2ui-tb-image w2ui-icon frame12" onclick="setBorderStyle(12)"></td></tr><tr>' +
+				      '<td colspan="4" class="w2ui-tb-image w2ui-icon frame13" onclick="setBorderStyle(0)"><div id="div-frame13">' + _('More...') + '</div></td></tr></table>'
 			},
 			{type: 'drop', id: 'conditionalformaticonset',  img: 'conditionalformatdialog', hint: _UNO('.uno:ConditionalFormatMenu', 'spreadsheet', true),
 				html: '<table id="conditionalformatmenu-grid"><tr>' +