Tests are improved, js calls are guarded
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/wicket-browser-info.js b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/wicket-browser-info.js
index 2118296..10b0bcc 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/wicket-browser-info.js
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/wicket-browser-info.js
@@ -58,8 +58,11 @@
info.screenHeight = window.screen.height;
info.screenColorDepth = window.screen.colorDepth;
}
- var jsTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
- info.jsTimeZone = jsTimeZone ? jsTimeZone : null;;
+ if (Intl && typeof(Intl.DateTimeFormat) === 'function' &&
+ typeof(Intl.DateTimeFormat().resolvedOptions) === 'function') {
+ var jsTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+ info.jsTimeZone = jsTimeZone ? jsTimeZone : null;
+ }
info.utcOffset = (new Date(new Date().getFullYear(), 0, 1, 0, 0, 0, 0).getTimezoneOffset() / -60);
info.utcDSTOffset = (new Date(new Date().getFullYear(), 6, 1, 0, 0, 0, 0).getTimezoneOffset() / -60);
info.browserWidth = window.innerWidth || document.body.offsetWidth;
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
index f9057b4..1078973 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ClientPropertiesTest.java
@@ -157,8 +157,6 @@
void timezoneJsPositive()
{
ClientProperties props = new ClientProperties();
- props.setUtcOffset("11");
- props.setUtcDSTOffset("10");
props.setJsTimeZone("Asia/Novosibirsk");
assertEquals(TimeZone.getTimeZone("Asia/Novosibirsk"), props.getTimeZone());
