[Libreoffice-commits] online.git: 2 commits - loleaflet/html loleaflet/Makefile.am

[Libreoffice Gerrit user]

 loleaflet/Makefile.am            |    8 +++++++-
 loleaflet/html/loleaflet.html.m4 |    4 ----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 4a6120d69b11bc1c6023bd4289d43df4b1e2ce02
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 19:03:07 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 9 19:05:33 2018 +0200

    Bin dead code
    
    In a script snippet that is inside an m4 ifdef for the non-MOBILEAPP
    case the window.ThisIsTheiOSApp can never be true.

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index ab33d1301..c29ef64c0 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -23,10 +23,6 @@ ifelse(MOBILEAPP,[],
   var PostMessageReadyListener = function(e) {
     var msg = JSON.parse(e.data);
     if (msg.MessageId === 'Host_PostmessageReady') {
-      if (window.ThisIsTheiOSApp) {
-        // Just for debugging to see that we got it
-        window.webkit.messageHandlers.debug.postMessage('got Host_PostmessageReady!');
-      }
       window.WOPIPostmessageReady = true;
       window.removeEventListener('message', PostMessageReadyListener, false);
     }
commit e58a28fe955e0d1e5eed4583ad925b4ce621ca1c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 9 01:03:45 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 9 19:05:33 2018 +0200

    We don't need the admin stuff in the mobile app

diff --git a/loleaflet/Makefile.am b/loleaflet/Makefile.am
index e23798264..c5dea0aad 100644
--- a/loleaflet/Makefile.am
+++ b/loleaflet/Makefile.am
@@ -127,12 +127,18 @@ all-local:
 	@$(MAKE) node_modules
 	@$(MAKE) build-loleaflet
 
+if !ENABLE_IOSAPP
+if !ENABLE_GTKAPP
+ADMIN_BUNDLE = $(builddir)/dist/admin-bundle.js
+endif
+endif
+
 build-loleaflet: | $(LOLEAFLET_L10N_DST) \
 	$(L10N_JSON) \
 	$(LOLEAFLET_IMAGES_DST) \
 	$(JQUERY_UI_DIST_IMAGES) \
 	$(LOLEAFLET_PREFIX)/dist/loleaflet-src.js \
-	$(builddir)/dist/admin-bundle.js \
+	$(ADMIN_BUNDLE) \
 	$(builddir)/dist/bundle.css \
 	$(builddir)/dist/bundle.js \
 	$(builddir)/dist/loleaflet.html