deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject deltaspike git commit: DELTASPIKE-971 CLIENTWINDOW mode broken in IE
Date Sun, 02 Aug 2015 14:37:33 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master e2ba93ae8 -> aa2d73f85


DELTASPIKE-971 CLIENTWINDOW mode broken in IE

Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/aa2d73f8
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/aa2d73f8
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/aa2d73f8

Branch: refs/heads/master
Commit: aa2d73f85cecc532d4a9a0ca822c5e66f7bbc263
Parents: e2ba93a
Author: Thomas Andraschko <tandraschko@apache.org>
Authored: Sun Aug 2 15:58:51 2015 +0200
Committer: Thomas Andraschko <tandraschko@apache.org>
Committed: Sun Aug 2 15:58:51 2015 +0200

----------------------------------------------------------------------
 .../main/resources/static/windowhandler.html    | 205 ++++++++++---------
 1 file changed, 108 insertions(+), 97 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/aa2d73f8/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
index 5fdb300..9108b93 100644
--- a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
+++ b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
@@ -1,6 +1,5 @@
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -19,9 +18,10 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <title>Loading...</title>
+        <meta http-equiv="content-type" content="text/html;charset=utf-8" />
         <script type="text/javascript" src="#{resource['deltaspike/windowhandler.js']}"></script>
     </head>
     <body>
@@ -29,117 +29,128 @@
             Your browser does not support JavaScript.
             Click <a href="$$noscriptUrl$$">here</a> to continue without JavaScript.
         </div>
-    </body>
 
-    <script type="text/javascript" >
-        function getOldBody() {
-            if (window.name.length !== null) {
-                return localStorage.getItem(window.name + '_body');
-            }
-        }
-        function getOldBodyAttrs() {
-            if (window.name.length !== null) {
-                return localStorage.getItem(window.name + '_bodyAttrs');
-            }
-        }
-        function getOldCss() {
-            if (window.name.length !== null) {
-                return dswh.utils.unstringify(localStorage.getItem(window.name + '_css'));
-            }
-        }
-
-        function addCss(url) {
-            var newSS = document.createElement("style");
-            newSS.setAttribute("rel", "stylesheet");
-            newSS.setAttribute("type", "text/css");
-            newSS.appendChild(document.createTextNode("@import url(" +url + ");"));
-            document.getElementsByTagName("head")[0].appendChild(newSS);
-        }
-
-        function loadCss(clean) {
-            if (!dswh.utils.isHtml5()) { // only do this stuff on html5 browsers
-                return;
+        <script type="text/javascript">
+            //<![CDATA[
+            function getOldBody() {
+                if (window.name.length !== null) {
+                    return localStorage.getItem(window.name + '_body');
+                }
             }
-            var oldCss  = getOldCss();
-            if (window.name && oldCss) {
-                for (i=0; oldCss && i< oldCss.length; i++) {
-                    addCss(oldCss[i]);
+            function getOldBodyAttrs() {
+                if (window.name.length !== null) {
+                    return localStorage.getItem(window.name + '_bodyAttrs');
                 }
-                if (clean) {
-                    localStorage.removeItem(window.name + '_css');
+            }
+            function getOldCss() {
+                if (window.name.length !== null) {
+                    return dswh.utils.unstringify(localStorage.getItem(window.name + '_css'));
                 }
             }
-        }
 
-        function replaceContent() {
-            if (!dswh.utils.isHtml5()) { // only do this stuff on html browsers
-                document.getElementById('message').textContent = "Loading...";
-                return;
+            function addCss(url) {
+                var newSS = document.createElement("style");
+                newSS.setAttribute("rel", "stylesheet");
+                newSS.setAttribute("type", "text/css");
+                newSS.appendChild(document.createTextNode("@import url(" +url + ");"));
+                document.getElementsByTagName("head")[0].appendChild(newSS);
             }
-            loadCss(false);
 
-            var oldBody = getOldBody();
-
-            if (window.name && oldBody) {
-                document.body.innerHTML = oldBody;
-
-                //X TODO should restore all attributes of the body tag
-                document.body.setAttribute("class", getOldBodyAttrs());
-                document.body.setAttribute("style", " cursor: wait !important;");
-
-                localStorage.removeItem(window.name + '_body');
-                localStorage.removeItem(window.name + '_bodyAttrs');
-
-                // overlay the doc with an un-clickable full-size div
-                var newDiv = document.createElement("div");
-                newDiv.setAttribute("style", "position:absolute; z-index:1000; background-color:transparent;
top:0; left:0; width:100%; height: 100%");
-                newDiv.setAttribute("class", "fulldiv");
-                document.body.appendChild(newDiv);
-            } else {
-                document.getElementById('message').textContent = "Loading...";
+            function loadCss(clean) {
+                if (!dswh.utils.isHtml5()) { // only do this stuff on html5 browsers
+                    return;
+                }
+                
+                if (!window.name) {
+                    return;
+                }
+                
+                var oldCss = getOldCss();
+                if (oldCss) {
+                    for (var i = 0; i < oldCss.length; i++) {
+                        addCss(oldCss[i]);
+                    }
+                    if (clean) {
+                        localStorage.removeItem(window.name + '_css');
+                    }
+                }
             }
-        }
-
-        replaceContent();
 
-        window.onload = function() {
-            // uncomment the following line to debug the intermediate page
-            // if (!confirm('reload?')) { return true; }
-
-            loadCss(true);
+            function replaceContent() {
+                if (!dswh.utils.isHtml5()) { // only do this stuff on html browsers
+                    document.getElementById('message').textContent = "Loading...";
+                    return;
+                }
+                
+                if (!window.name) {
+                    return;
+                }
+                
+                loadCss(false);
+
+                var oldBody = getOldBody();
+                if (oldBody) {
+                    document.body.innerHTML = oldBody;
+
+                    //X TODO should restore all attributes of the body tag
+                    document.body.setAttribute("class", getOldBodyAttrs());
+                    document.body.setAttribute("style", " cursor: wait !important;");
+
+                    localStorage.removeItem(window.name + '_body');
+                    localStorage.removeItem(window.name + '_bodyAttrs');
+
+                    // overlay the doc with an un-clickable full-size div
+                    var newDiv = document.createElement("div");
+                    newDiv.setAttribute("style", "position:absolute; z-index:1000; background-color:transparent;
top:0; left:0; width:100%; height: 100%");
+                    newDiv.setAttribute("class", "fulldiv");
+                    document.body.appendChild(newDiv);
+                } else {
+                    document.getElementById('message').textContent = "Loading...";
+                }
+            }
 
-            var windowId = window.name;
-            var urlId = windowId;
-            if (!windowId || windowId.length < 1) {
-                var newWindowId = '$$windowIdValue$$';
-                if (newWindowId !== 'uninitializedWindowId') {
-                    window.name = newWindowId; // set the window.name with our windowId
-                    windowId = newWindowId;
-                    urlId = windowId;
+            replaceContent();
+
+            window.onload = function() {
+                // uncomment the following line to debug the intermediate page
+                // if (!confirm('reload?')) { return true; }
+
+                loadCss(true);
+
+                var windowId = window.name;
+                var urlId = windowId;
+                if (!windowId || windowId.length < 1) {
+                    var newWindowId = '$$windowIdValue$$';
+                    if (newWindowId !== 'uninitializedWindowId') {
+                        window.name = newWindowId; // set the window.name with our windowId
+                        windowId = newWindowId;
+                        urlId = windowId;
+                    }
+                    else {
+                        windowId = 'automatedEntryPoint';
+                        urlId = null;
+                    }
                 }
-                else {
+                // occurs with the "duplicate tab" feature of chrome
+                else if (windowId === 'tempWindowId') {
+                    window.name = '';
                     windowId = 'automatedEntryPoint';
                     urlId = null;
                 }
-            }
-            // occurs with the "duplicate tab" feature of chrome
-            else if (windowId === 'tempWindowId') {
-                window.name = '';
-                windowId = 'automatedEntryPoint';
-                urlId = null;
-            }
 
-            var requestToken = dswh.utils.generateRequestToken();
+                var requestToken = dswh.utils.generateRequestToken();
 
-            var redirectUrl = window.location.href;
-            redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dsrid", requestToken);
-            // we still add the windowId page param to support lazy windowId dropping for
some clients
-            redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dswid", urlId);
+                var redirectUrl = window.location.href;
+                redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dsrid", requestToken);
+                // we still add the windowId page param to support lazy windowId dropping
for some clients
+                redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dswid", urlId);
 
-            dswh.utils.storeCookie('dsrwid-' + requestToken, windowId, 3);
+                dswh.utils.storeCookie('dsrwid-' + requestToken, windowId, 3);
 
-            window.location = redirectUrl;
-        };
-    </script>
+                window.location = redirectUrl;
+            };
+            //]]>
+        </script>
+    </body>
 
 </html>


Mime
View raw message