You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2018/01/02 19:34:05 UTC
wicket git commit: WICKET-6498 corrected readyStates
Repository: wicket
Updated Branches:
refs/heads/WICKET-6498_deferred_javascript d77ba274f -> 01d103a3e
WICKET-6498 corrected readyStates
already dom ready when !== 'loading'
already loaded when === 'complete'
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/01d103a3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/01d103a3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/01d103a3
Branch: refs/heads/WICKET-6498_deferred_javascript
Commit: 01d103a3ee999769cab0275b3c74edfd491e753a
Parents: d77ba27
Author: Sven Meier <sv...@apache.org>
Authored: Tue Jan 2 20:32:35 2018 +0100
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Jan 2 20:32:40 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java | 2 +-
.../main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/01d103a3/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
index b935a3e..3be1879 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnDomReadyHeaderItem.java
@@ -87,7 +87,7 @@ public class OnDomReadyHeaderItem extends HeaderItem
if (Strings.isEmpty(js) == false)
{
JavaScriptUtils.writeJavaScript(response,
- "var f = function() {" + js + ";};\nif ('complete' === document.readyState) f(); else document.addEventListener('DOMContentLoaded', f);");
+ "var f = function() {" + js + ";};\nif ('loading' !== document.readyState) f(); else document.addEventListener('DOMContentLoaded', f);");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/01d103a3/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
index b2f3025..196f0b0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/OnLoadHeaderItem.java
@@ -87,7 +87,7 @@ public class OnLoadHeaderItem extends HeaderItem
if (Strings.isEmpty(js) == false)
{
JavaScriptUtils.writeJavaScript(response,
- "var f = function() {" + js + ";};\nif ('loaded' === document.readyState) f(); else window.addEventListener('load', f);");
+ "var f = function() {" + js + ";};\nif ('complete' === document.readyState) f(); else window.addEventListener('load', f);");
}
}