Compute the location also in WebWorker environment
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Fri, 11 Oct 2013 16:33:54 +0200
changeset 1368bce873fcaf1a
parent 1367 6193e735f4d1
child 1369 a94126dbeabc
Compute the location also in WebWorker environment
rt/emul/mini/src/main/java/java/net/URL.java
     1.1 --- a/rt/emul/mini/src/main/java/java/net/URL.java	Fri Oct 11 09:58:03 2013 +0200
     1.2 +++ b/rt/emul/mini/src/main/java/java/net/URL.java	Fri Oct 11 16:33:54 2013 +0200
     1.3 @@ -1070,10 +1070,16 @@
     1.4      }
     1.5      
     1.6      @JavaScriptBody(args = {}, body = 
     1.7 -          "if (typeof window !== 'object') return null;\n"
     1.8 -        + "if (!window.location) return null;\n"
     1.9 -        + "if (!window.location.href) return null;\n"
    1.10 -        + "return window.location.href;\n"
    1.11 +          "var l;\n"
    1.12 +        + "if (typeof location !== 'object') {"
    1.13 +        + "  if (typeof window !== 'object') return null;\n"
    1.14 +        + "  if (!window.location) return null;\n"
    1.15 +        + "  l = window.location;\n"
    1.16 +        + "} else {\n"
    1.17 +        + "  l = location;\n"
    1.18 +        + "}\n"
    1.19 +        + "if (!l.href) return null;\n"
    1.20 +        + "return l.href;\n"
    1.21      )
    1.22      private static native String findBaseURL();
    1.23  }