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

[Libreoffice Gerrit user]

 loleaflet/html/loleaflet.html.m4 |   61 +++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

New commits:
commit eb332fdde087adc633fa2533bca310134e57d223
Author:     Florin Ciornei <florin.ciornei at collabora.com>
AuthorDate: Thu Mar 21 11:28:05 2019 +0100
Commit:     Jan Holesovsky <kendy at collabora.com>
CommitDate: Thu Mar 21 14:05:23 2019 +0100

    android: Move window.ThisIsAMobileApp etc before they are used in global.js
    
    It was causing the code to connect to a real socket instead of the
    FakeWebSocket.
    
    Change-Id: I0d08277e7138317ac06a13022eaba7ec672e0429
    Reviewed-on: https://gerrit.libreoffice.org/69500
    Reviewed-by: Jan Holesovsky <kendy at collabora.com>
    Tested-by: Jan Holesovsky <kendy at collabora.com>

diff --git a/loleaflet/html/loleaflet.html.m4 b/loleaflet/html/loleaflet.html.m4
index 272464a66..242af92f5 100644
--- a/loleaflet/html/loleaflet.html.m4
+++ b/loleaflet/html/loleaflet.html.m4
@@ -32,6 +32,36 @@ ifelse(MOBILEAPP,[],
   window.addEventListener('message', PostMessageReadyListener, false);
 )dnl
 
+dnl# For use in conditionals in JS: window.ThisIsAMobileApp, window.ThisIsTheiOSApp,
+dnl# and window.ThisIsTheGtkApp
+
+ifelse(MOBILEAPP,[true],
+  [   window.ThisIsAMobileApp = true;
+   window.MobileAppName='MOBILEAPPNAME';],
+  [   window.ThisIsAMobileApp = false;]
+)
+ifelse(IOSAPP,[true],
+  [   window.ThisIsTheiOSApp = true;
+   window.postMobileMessage = function(msg) { window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
+   window.postMobileError   = function(msg) { window.webkit.messageHandlers.error.postMessage(msg, '*'); };
+   window.postMobileDebug   = function(msg) { window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
+  [   window.ThisIsTheiOSApp = false;]
+)
+ifelse(GTKAPP,[true],
+  [   window.ThisIsTheGtkApp = true;
+   window.postMobileMessage = function(msg) { window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
+   window.postMobileError   = function(msg) { window.webkit.messageHandlers.error.postMessage(msg, '*'); };
+   window.postMobileDebug   = function(msg) { window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
+  [   window.ThisIsTheGtkApp = false;]
+)
+ifelse(ANDROIDAPP,[true],
+  [   window.ThisIsTheAndroidApp = true;
+   window.postMobileMessage = function(msg) { window.LOOLMessageHandler.postMobileMessage(msg); };
+   window.postMobileError   = function(msg) { window.LOOLMessageHandler.postMobileError(msg); };
+   window.postMobileDebug   = function(msg) { window.LOOLMessageHandler.postMobileDebug(msg); };],
+  [   window.ThisIsTheAndroidApp = false;]
+)
+
 var Base64ToArrayBuffer = function(base64Str) {
   var binStr = atob(base64Str);
   var ab = new ArrayBuffer(binStr.length);
@@ -171,37 +201,6 @@ ifelse(MOBILEAPP,[true],
       window.tileSize = 256;])
 syscmd([cat ]GLOBAL_JS)dnl
     </script>
-  <script defer>
-
-dnl# For use in conditionals in JS: window.ThisIsAMobileApp, window.ThisIsTheiOSApp,
-dnl# and window.ThisIsTheGtkApp
-ifelse(MOBILEAPP,[true],
-  [   window.ThisIsAMobileApp = true;
-   window.MobileAppName='MOBILEAPPNAME';],
-  [   window.ThisIsAMobileApp = false;]
-)
-ifelse(IOSAPP,[true],
-  [   window.ThisIsTheiOSApp = true;
-   window.postMobileMessage = function(msg) { window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
-   window.postMobileError   = function(msg) { window.webkit.messageHandlers.error.postMessage(msg, '*'); };
-   window.postMobileDebug   = function(msg) { window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
-  [   window.ThisIsTheiOSApp = false;]
-)
-ifelse(GTKAPP,[true],
-  [   window.ThisIsTheGtkApp = true;
-   window.postMobileMessage = function(msg) { window.webkit.messageHandlers.lool.postMessage(msg, '*'); };
-   window.postMobileError   = function(msg) { window.webkit.messageHandlers.error.postMessage(msg, '*'); };
-   window.postMobileDebug   = function(msg) { window.webkit.messageHandlers.debug.postMessage(msg, '*'); };],
-  [   window.ThisIsTheGtkApp = false;]
-)
-ifelse(ANDROIDAPP,[true],
-  [   window.ThisIsTheAndroidApp = true;
-   window.postMobileMessage = function(msg) { window.LOOLMessageHandler.postMobileMessage(msg); };
-   window.postMobileError   = function(msg) { window.LOOLMessageHandler.postMobileError(msg); };
-   window.postMobileDebug   = function(msg) { window.LOOLMessageHandler.postMobileDebug(msg); };],
-  [   window.ThisIsTheAndroidApp = false;]
-)
-  </script>
 
 ifelse(MOBILEAPP,[true],
   ifelse(DEBUG,[true],foreachq([fileJS],[LOLEAFLET_JS],