You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/05/23 16:00:49 UTC
[myfaces-tobago] branch master updated: TOBAGO-1900: Tests aren't
executable with IE 11
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/master by this push:
new bb55cd9 TOBAGO-1900: Tests aren't executable with IE 11
bb55cd9 is described below
commit bb55cd99c5a4849b12297127265ef06b7e43966a
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Wed May 23 18:00:15 2018 +0200
TOBAGO-1900: Tests aren't executable with IE 11
Applying fix of DeltaSpike 1.8.1 for
https://issues.apache.org/jira/browse/DELTASPIKE-1306
---
.../tobago-bootstrap/_version/js/tobago-deltaspike.js | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-deltaspike.js b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-deltaspike.js
index dea48e2..a9b43be 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-deltaspike.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/tobago/standard/tobago-bootstrap/_version/js/tobago-deltaspike.js
@@ -28,7 +28,7 @@ jQuery(document).ready(function() {
}
});
-// taken from deltaspike 1.7.2
+// taken from deltaspike 1.8.1
window.dswh = window.dswh || {
@@ -36,6 +36,7 @@ window.dswh = window.dswh || {
TEMP_WINDOW_NAME : 'tempWindowId',
MANAGED_WINDOW_NAME_PREFIX : 'ds-',
+ initialized: false,
windowId : null,
clientWindowRenderMode : null,
maxWindowIdLength : 10,
@@ -43,6 +44,11 @@ window.dswh = window.dswh || {
init : function(windowId, clientWindowRenderMode, maxWindowIdLength, cfg) {
+ if (dswh.initialized === true) {
+ return;
+ }
+ dswh.initialized = true;
+
dswh.utils.log('------- DeltaSpike windowhandler.js -------');
dswh.utils.log('--- #init(\'' + windowId + '\', \'' + clientWindowRenderMode + '\',' + maxWindowIdLength + ',' + dswh.utils.stringify(cfg) + ')');
dswh.utils.log('window.name: ' + window.name);
@@ -452,8 +458,12 @@ window.dswh = window.dswh || {
requestNewWindowId : function() {
// set temp window name to remember the current state
dswh.utils.setWindowIdAsWindowName(dswh.TEMP_WINDOW_NAME);
+
// we remove the dswid if available and redirect to the same url again to create a new windowId
window.location = dswh.utils.setUrlParam(window.location.href, 'dswid', null);
+
+ // set temp window name to remember the current state (again - sometimes required for IE!?)
+ setTimeout("dswh.utils.setWindowIdAsWindowName(dswh.TEMP_WINDOW_NAME);", 1);
},
isHtml5 : function() {
--
To stop receiving notification emails like this one, please contact
lofwyr@apache.org.