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

[Henry Castro (via logerrit)]

 loleaflet/src/dom/DomUtil.js |    4 ++++
 loleaflet/src/map/Map.js     |   19 ++++++-------------
 2 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 69084bd2146f4f853eb49576e49fe6ab8466fd02
Author:     Henry Castro <hcastro at collabora.com>
AuthorDate: Wed Nov 20 11:05:20 2019 -0400
Commit:     Henry Castro <hcastro at collabora.com>
CommitDate: Wed Nov 20 16:10:34 2019 +0100

    loleafet: use DOM Util functions to remove an element
    
    Change-Id: I33ed32cd475ec90f930c9d6e4e900fafc6519ea7
    Reviewed-on: https://gerrit.libreoffice.org/83325
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Tested-by: Henry Castro <hcastro at collabora.com>

diff --git a/loleaflet/src/dom/DomUtil.js b/loleaflet/src/dom/DomUtil.js
index 82045a5d0..1c38ceb7d 100644
--- a/loleaflet/src/dom/DomUtil.js
+++ b/loleaflet/src/dom/DomUtil.js
@@ -49,6 +49,10 @@ L.DomUtil = {
 	},
 
 	remove: function (el) {
+		if (!el) {
+			return;
+		}
+
 		var parent = el.parentNode;
 		if (parent) {
 			parent.removeChild(el);
diff --git a/loleaflet/src/map/Map.js b/loleaflet/src/map/Map.js
index 947706fb5..ca6843ee8 100644
--- a/loleaflet/src/map/Map.js
+++ b/loleaflet/src/map/Map.js
@@ -195,22 +195,15 @@ L.Map = L.Evented.extend({
 				var interactiveRuler = this._permission === 'edit' ? true : false;
 				L.control.ruler({position:'topleft', interactive:interactiveRuler}).addTo(this);
 			}
-			var elem;
 			if (this._docLayer._docType === 'text') {
-				elem = L.DomUtil.get('spreadsheet-row-column-frame');
-				elem.parentNode.removeChild(elem);
-				elem = L.DomUtil.get('spreadsheet-toolbar');
-				elem.parentNode.removeChild(elem);
-				elem = L.DomUtil.get('presentation-controls-wrapper');
-				elem.parentNode.removeChild(elem);
+				L.DomUtil.remove(L.DomUtil.get('spreadsheet-row-column-frame'));
+				L.DomUtil.remove(L.DomUtil.get('spreadsheet-toolbar'));
+				L.DomUtil.remove(L.DomUtil.get('presentation-controls-wrapper'));
 			} else if (this._docLayer._docType === 'presentation') {
-				elem = L.DomUtil.get('spreadsheet-row-column-frame');
-				elem.parentNode.removeChild(elem);
-				elem = L.DomUtil.get('spreadsheet-toolbar');
-				elem.parentNode.removeChild(elem);
+				L.DomUtil.remove(L.DomUtil.get('spreadsheet-row-column-frame'));
+				L.DomUtil.remove(L.DomUtil.get('spreadsheet-toolbar'));
 			} else if (this._docLayer._docType === 'spreadsheet') {
-				elem = L.DomUtil.get('presentation-controls-wrapper');
-				elem.parentNode.removeChild(elem);
+				L.DomUtil.remove(L.DomUtil.get('presentation-controls-wrapper'));
 			}
 
 			// We need core's knowledge of whether it is a mobile phone or not (which is