Merge branch 'gwt' into 'master'

Gwt

4 files changed, 10 insertions, 1362 deletions

diff --git a/website/assets/css/style.css b/website/assets/css/style.css
index d3f4f5a..f69a263 100644
--- a/website/assets/css/style.css
+++ b/website/assets/css/style.css
@@ -59,16 +59,14 @@ ul .fa {
 }
 
 .overbox {
-        /*display: none;*/
         margin-left: -100%;
 }
 
 .overbox:target {
-        /*display: block;*/
         margin-left: 0;
 }
 
-#play > * {
+#game-frame {
         margin-top: 120px;
         margin-left: 90px;
         width: calc(100% - 180px);
@@ -78,6 +76,9 @@ ul .fa {
 #map-frame {
         width: 100%;
         height: 100%;
+}
+
+iframe {
         border: none;
         overflow: hidden;
-}
\ No newline at end of file
+}
diff --git a/website/assets/js/deployJava.js b/website/assets/js/deployJava.js
deleted file mode 100644
index 879df1c..0000000
--- a/website/assets/js/deployJava.js
+++ /dev/null
@@ -1,1305 +0,0 @@
-/*
- * Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
- * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- *
- *   - Neither the name of Oracle nor the names of its
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * deployJava.js
- *
- * This file is part of the Deployment Toolkit.  It provides functions for web
- * pages to detect the presence of a JRE, install the latest JRE, and easily run
- * applets or Web Start programs.  More Information on usage of the
- * Deployment Toolkit can be found in the Deployment Guide at:
- * http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/index.html
- *
- * The "live" copy of this file may be found at :
- * http://java.com/js/deployJava.js.
- * For web pages provisioned using https, you may want to access the copy at:
- * https://java.com/js/deployJava.js.
- *
- * You are encouraged to link directly to the live copies.
- * The above files are stripped of comments and whitespace for performance,
- * You can access this file w/o the whitespace and comments removed at:
- * http://java.com/js/deployJava.txt.
- *
- */
-
-var deployJava = function() {
-    /** HTML attribute filter implementation */
-    var hattrs = {
-        core: [ 'id', 'class', 'title', 'style' ],
-        i18n: [ 'lang', 'dir' ],
-        events: [ 'onclick', 'ondblclick', 'onmousedown', 'onmouseup',
-            'onmouseover', 'onmousemove', 'onmouseout', 'onkeypress',
-            'onkeydown', 'onkeyup' ],
-        applet: [ 'codebase', 'code', 'name', 'archive', 'object',
-            'width', 'height', 'alt', 'align', 'hspace', 'vspace' ],
-        object: [ 'classid', 'codebase', 'codetype', 'data', 'type',
-            'archive', 'declare', 'standby', 'height', 'width', 'usemap',
-            'name', 'tabindex', 'align', 'border', 'hspace', 'vspace' ]
-    };
-
-    var object_valid_attrs = hattrs.object.concat(hattrs.core, hattrs.i18n,
-        hattrs.events);
-    var applet_valid_attrs = hattrs.applet.concat(hattrs.core);
-
-    // generic log function, use console.log unless it isn't available
-    // then revert to alert()
-    function log(message) {
-        if ( ! rv.debug ) {return};
-
-        if (console.log) {
-            console.log(message);
-        } else {
-            alert(message);
-        }
-    }
-
-    //checks where given version string matches query
-    //
-    //NB: assume format is correct. Can add format check later if needed
-    // from dtjava.js
-    function versionCheckEx(query, version) {
-        if (query == null || query.length == 0) return true;
-
-        var c = query.charAt(query.length - 1);
-
-        //if it is not explicit pattern but does not have update version then need to append *
-        if (c != '+' && c != '*' && (query.indexOf('_') != -1 && c != '_')) {
-            query = query + "*";
-            c = '*';
-        }
-
-        query = query.substring(0, query.length - 1);
-        //if query ends with ".", "_" then we want to strip it to allow match of "1.6.*" to shorter form such as "1.6"
-        //TODO: add support for match of "1.7.0*" to "1.7"?
-        if (query.length > 0) {
-            var z = query.charAt(query.length - 1);
-            if (z == '.' || z == '_') {
-                query = query.substring(0, query.length - 1);
-            }
-        }
-        if (c == '*') {
-            //it is match if version starts from it
-            return (version.indexOf(query) == 0);
-        } else if (c == '+') {
-            //match if query string is lexicographically smaller
-            return query <= version;
-        }
-        return false;
-    }
-
-    function getWebStartLaunchIconURL() {
-        var imageUrl = '//java.com/js/webstart.png';
-        try {
-            // for http/https; use protocol less url; use http for all other protocol
-            return document.location.protocol.indexOf('http') != -1 ? 
-                imageUrl : 'http:' + imageUrl;
-        } catch (err) {
-            return 'http:' + imageUrl;
-        }
-    }
-
-     // GetJava page
-     function constructGetJavaURL(query) {
-            
-        var getJavaURL = 'http://java.com/dt-redirect';
-
-        if (query == null || query.length == 0) return getJavaURL;
-        if(query.charAt(0) == '&')
-        {
-           query = query.substring(1, query.length);    
-        }
-        return getJavaURL + '?'+  query;
-    }
-
-    function arHas(ar, attr) {
-        var len = ar.length;
-        for (var i = 0; i < len; i++) {
-            if (ar[i] === attr) return true;
-        }
-        return false;
-    }
-
-    function isValidAppletAttr(attr) {
-        return arHas(applet_valid_attrs, attr.toLowerCase());
-    }
-
-    function isValidObjectAttr(attr) {
-        return arHas(object_valid_attrs, attr.toLowerCase());
-    }
-
-    /** 
-     * returns true if we can enable DT plugin auto-install without chance of
-     * deadlock on cert mismatch dialog
-     *
-     * requestedJREVersion param is optional - if null, it will be
-     * treated as installing any JRE version
-     * 
-     * DT plugin for 6uX only knows about JRE installer signed by SUN cert.
-     * If it encounter Oracle signed JRE installer, it will have chance of
-     * deadlock when running with IE.  This function is to guard against this.
-     */
-    function enableWithoutCertMisMatchWorkaround(requestedJREVersion) {
-
-       // Non-IE browser are okay
-       if ('MSIE' != deployJava.browserName) return true;
-
-       // if DT plugin is 10.0.0 or above, return true
-       // This is because they are aware of both SUN and Oracle signature and
-       // will not show cert mismatch dialog that might cause deadlock
-       if (deployJava.compareVersionToPattern(deployJava.getPlugin().version, 
-                                     ["10", "0", "0"], false, true)) {
-          return true;
-       }
-
-       // If we got there, DT plugin is 6uX
-
-       if (requestedJREVersion  == null) {
-          // if requestedJREVersion is not defined - it means ANY.
-          // can not guarantee it is safe to install ANY version because 6uX