[Libreoffice-commits] online.git: 2 commits - loleaflet/css loleaflet/js loleaflet/src test/httpwstest.cpp

[Libreoffice Gerrit user]

 loleaflet/css/toolbar.css             |    2 +-
 loleaflet/js/toolbar.js               |    2 +-
 loleaflet/src/layer/tile/GridLayer.js |    8 +++++---
 test/httpwstest.cpp                   |    1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 209e1cd7eef466a75b3360b819078112720a47e6
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Dec 14 17:59:00 2018 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Dec 14 17:59:00 2018 +0100

    Handle Special character toolbar item state correctly
    
    The toolbar item should have the same names as the UNO command in lower case.
    
    Change-Id: I68264e7d58cca829084965fb5ea9686a85ccd9cd

diff --git a/loleaflet/css/toolbar.css b/loleaflet/css/toolbar.css
index 53d5b7490..59aa34953 100644
--- a/loleaflet/css/toolbar.css
+++ b/loleaflet/css/toolbar.css
@@ -562,7 +562,7 @@ button.leaflet-control-search-next
 .w2ui-icon.inserttable{ background: url('images/lc_inserttable.svg') no-repeat center !important; }
 .w2ui-icon.insertgraphic{ background: url('images/lc_gallery.svg') no-repeat center !important; }
 .w2ui-icon.link{ background: url('images/lc_inserthyperlink.svg') no-repeat center !important; }
-.w2ui-icon.specialcharacter{ background: url('images/lc_insertsymbol.svg') no-repeat center !important; }
+.w2ui-icon.insertsymbol{ background: url('images/lc_insertsymbol.svg') no-repeat center !important; }
 .w2ui-icon.edit{ background: url('images/lc_editdoc.svg') no-repeat center !important; }
 .w2ui-icon.fold{ background: url('images/fold.svg') no-repeat center !important; }
 .w2ui-icon.unfold{ background: url('images/unfold.svg') no-repeat center !important; }
diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 2895ea858..f1d8c611f 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -829,7 +829,7 @@ function createToolbar() {
 			html: '<div id="insertshape-wrapper"><div id="insertshape-popup" class="insertshape-pop ui-widget ui-corner-all"><div class="insertshape-grid"></div></div></div>'},
 
 		{type: 'button',  id: 'link',  img: 'link', hint: _UNO('.uno:HyperlinkDialog'), uno: 'HyperlinkDialog', disabled: true},
-		{type: 'button',  id: 'specialcharacter', img: 'specialcharacter', hint: _UNO('.uno:InsertSymbol', '', true), uno: '.uno:InsertSymbol'},
+		{type: 'button',  id: 'insertsymbol', img: 'insertsymbol', hint: _UNO('.uno:InsertSymbol', '', true), uno: 'InsertSymbol'},
 		{type: 'spacer'},
 		{type: 'button',  id: 'edit',  img: 'edit'},
 		{type: 'button',  id: 'fold',  img: 'fold', mobile: false},
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index b8c59a177..69fa2e6fd 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -2152,6 +2152,7 @@ void HTTPWSTest::testStateUnoCommandImpress()
         ".uno:PageStatus=",
         ".uno:LayoutStatus=",
         ".uno:Context=",
+        ".uno:InsertSymbol=",
     };
 
     try
commit 1fd9242dbe1d7f9d4a6252dcdcd7ef0ce898b819
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Nov 15 16:56:42 2018 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Fri Dec 14 16:21:28 2018 +0100

    Fix up _addTiles method to handle existing tiles correctly
    
    Change-Id: Ic5507d27c7bb0111fcfa2e366018cb67bb9248f8

diff --git a/loleaflet/src/layer/tile/GridLayer.js b/loleaflet/src/layer/tile/GridLayer.js
index afca4f8b4..4d8792779 100644
--- a/loleaflet/src/layer/tile/GridLayer.js
+++ b/loleaflet/src/layer/tile/GridLayer.js
@@ -921,10 +921,12 @@ L.GridLayer = L.Layer.extend({
 						tile: tile,
 						coords: coords
 					});
+				} else {
+					tile = this._tiles[key].el;
+				}
 
-					if (this._tileCache[key]) {
-						tile.src = this._tileCache[key];
-					}
+				if (this._tileCache[key]) {
+					tile.src = this._tileCache[key];
 				}
 			}