Author: mgrigorov
Date: Tue May 10 14:48:01 2011
New Revision: 1101485
URL: http://svn.apache.org/viewvc?rev=1101485&view=rev
Log:
WICKET-3669 <script> element in Ajax requests is executed twice in Opera 11
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=1101485&r1=1101484&r2=1101485&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Tue May 10 14:48:01 2011
@@ -267,7 +267,12 @@ Wicket.replaceOuterHtmlIE = function(ele
// place all newly created elements before the old element
while(tempParent.childNodes.length > 0) {
var tempElement = tempParent.childNodes[0];
- parent.insertBefore(tempElement, element);
+ if (tempElement.tagName != 'SCRIPT') {
+ parent.insertBefore(tempElement, element);
+ } else {
+ // ignore <script> elements. they are handled
separately
+ tempParent.removeChild(tempElement);
+ }
tempElement = null;
}
@@ -2502,4 +2507,4 @@ Wicket._createIFrame = function(iframeNa
Wicket._getAjaxBaseUrl = function() {
var baseUrl = Wicket.Ajax.baseUrl || '.';
return baseUrl;
-}
\ No newline at end of file
+}