Changes between Version 11 and Version 12 of TestWebSwing2

Timestamp:

11/15/18 16:28:38 (6 years ago)

Author:

Bart Vastenhouw

Comment:

--

TestWebSwing2

@@ -1 +1 @@
 {{{
 #!html
-<div class="webswing-element" data-webswing-instance="webswingInstance0">
-    <div id="loading" class="ws-modal-container">
-        <div class="ws-login">
-                <div  class="ws-login-content">
-<div class="ws-spinner"><div class="ws-spinner-dot-1"></div> <div class="ws-spinner-dot-2"></div></div></div>
-                </div>
-            </div>
-        </div>
+<div 
+ style="height:500px;" 
+ data-webswing-instance="webswing" 
+ data-webswing-options="{autoStart:true,  anonym:true,  args:'foo',  applicationName:'bart', connectionUrl:'https://webswing.ewi.tudelft.nl/bart/'}">
+</div>
+
 <script>
-    var webswingInstance0 = {
-        options: {
-            autoStart: true,
-                        connectionUrl:'https://webswing.ewi.tudelft.nl/bart/',
-            args: getParam('args'),
-            recording: getParam('recording'),
-            binarySocket: getParam('binarySocket'),
-            debugPort: getParam('debugPort'),
-            recordingPlayback: getParam('recordingPlayback'),
-            securityToken: getParam('securityToken'),
-            realm: getParam('realm'),
-            debugLog: getParam('debugLog')
+    (function (window, document) {
+      var loader = function () {
+        //fix for ie
+        if (!window.location.origin) {
+            window.location.origin = window.location.protocol + "//" + window.location.hostname
+                    + (window.location.port ? ':' + window.location.port : '');
         }
-    }
-
-    function getParam(name) {
-        name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
-        var results = new RegExp("[\\?&]" + name + "=([^&#]*)").exec(location.href);
-        return results == null ? null : decodeURIComponent(results[1]);
-    }
-</script>
-
-<script data-webswing-global-var="webswing">
-    (function (window, document) {
-        var loader = function () {
-            //fix for ie
-            if (!window.location.origin) {
-                window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port : '');
+        var xmlhttp = new XMLHttpRequest();
+        xmlhttp.onreadystatechange = function() {
+            if (xmlhttp.readyState == XMLHttpRequest.DONE ) {
+                var version = xmlhttp.status == 200 ? xmlhttp.responseText : "undefined";
+                var script = document.createElement("script"), tag = document.getElementsByTagName("script")[0];
+                script.src =  document.location.origin + document.location.pathname + "javascript/webswing-embed.js?version="+version;
+                tag.parentNode.insertBefore(script, tag);
             }
-                        var baseUrl = 'https://webswing.ewi.tudelft.nl/bart/';
-            baseUrl = baseUrl.indexOf("/", baseUrl.length - 1) !== -1 ? baseUrl : (baseUrl + "/");
-            var xmlhttp = new XMLHttpRequest();
-            xmlhttp.onreadystatechange = function () {
-                if (xmlhttp.readyState == XMLHttpRequest.DONE) {
-                    var version = xmlhttp.status == 200 ? xmlhttp.responseText : "undefined";
-                    var script = document.createElement("script"),
-                        tag = document.getElementsByTagName("script")[0];
-                    script.src = baseUrl + "javascript/webswing-embed.js?version=" + version;
-                    tag.parentNode.insertBefore(script, tag);
-                }
-            };
-            xmlhttp.open("GET", baseUrl + "rest/version", true);
-            xmlhttp.send();
         };
-        window.addEventListener ? window.addEventListener("load", loader, false) : window.attachEvent("onload", loader);
+        xmlhttp.open("GET", document.location.origin + document.location.pathname +"rest/webswing/version", true);
+        xmlhttp.send();
+      };
+      window.addEventListener ? window.addEventListener("load", loader, false) : window.attachEvent("onload", loader);
     })(window, document);
 </script>