You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2020/12/15 13:47:10 UTC
[myfaces-tobago] 02/02: TOBAGO-2062 - Tobago2: Navigation after
ajax request not working on immediate: deltaspike.js
This is an automated email from the ASF dual-hosted git repository.
weber pushed a commit to branch tobago-2.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit 4982af897d91458b08552c58de8c7b3b6ef1daec
Author: Volker Weber <v....@inexso.de>
AuthorDate: Tue Dec 15 14:35:58 2020 +0100
TOBAGO-2062 - Tobago2: Navigation after ajax request not working on immediate: deltaspike.js
---
.../html/standard/standard/script/tobago-deltaspike.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-deltaspike.js b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-deltaspike.js
index 876a3c3..967d0ba 100644
--- a/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-deltaspike.js
+++ b/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-deltaspike.js
@@ -18,13 +18,15 @@
*/
jQuery(document).ready(function() {
- var dswid = location.search.replace(/.*dswid=(\-?[0-9]+).*/, "$1");
- if (dswid) {
- dswh.init(dswid, 'LAZY', 10, {
- 'tokenizedRedirect': false,
- 'storeWindowTreeOnLinkClick': true,
- 'storeWindowTreeOnButtonClick': false
- });
+ if (location.search.match(/.*dswid=(\-?[0-9]+).*/) !== null) {
+ var dswid = location.search.replace(/.*dswid=(\-?[0-9]+).*/, "$1");
+ if (dswid) {
+ dswh.init(dswid, 'LAZY', 10, {
+ 'tokenizedRedirect': false,
+ 'storeWindowTreeOnLinkClick': true,
+ 'storeWindowTreeOnButtonClick': false
+ });
+ }
}
});