Author: mgrigorov
Date: Mon Jun 13 15:16:19 2011
New Revision: 1135134
URL: http://svn.apache.org/viewvc?rev=1135134&view=rev
Log:
WICKET-3781 Differentiate Google Chrome from Safari in wicket-xyz.js
Add Wicket.Browser.isChrome().
With this addition Chromium based browsers are treated as Gecko based ones in
replaceOuterHtml() function.
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js?rev=1135134&r1=1135133&r2=1135134&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/wicket-event.js
Mon Jun 13 15:16:19 2011
@@ -48,7 +48,11 @@ if (typeof(Wicket.Browser) == "undefined
},
isSafari: function() {
- return /KHTML/.test(navigator.userAgent) &&
/Apple/.test(navigator.userAgent);
+ return !/Chrome/.test(navigator.userAgent) &&
/KHTML/.test(navigator.userAgent) && /Apple/.test(navigator.userAgent);
+ },
+
+ isChrome: function() {
+ return /KHTML/.test(navigator.userAgent) &&
/Apple/.test(navigator.userAgent) && /Chrome/.test(navigator.userAgent);
},
isOpera: function() {
@@ -180,8 +184,12 @@ if (typeof(Wicket.Event) == "undefined")
Wicket.Event.fireDomReadyHandlers();
}.bind(this);
- if (document.readyState &&
(Wicket.Browser.isKHTML() || Wicket.Browser.isSafari())) {
- //safari and konqueror don't support the
event - simulate it through a timeout
+ if (document.readyState &&
+ (Wicket.Browser.isKHTML() ||
+ Wicket.Browser.isSafari() ||
+ Wicket.Browser.isChrome())
+ ) {
+ // chrome, safari and konqueror don't support
the event - simulate it through a timeout
var domCheck = function() {
if (document.readyState ==
"loaded" ||
document.readyState ==
"complete") {
@@ -212,4 +220,4 @@ if (typeof(Wicket.Event) == "undefined")
}
}
};
-}
\ No newline at end of file
+}