Author: frankbille
Date: Sun Dec 9 03:05:19 2007
New Revision: 602659
URL: http://svn.apache.org/viewvc?rev=602659&view=rev
Log:
Merged with trunk:
- wicket-ajax bugfixes
- modal window bugfixes
Modified:
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Modified:
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL:
http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=602659&r1=602658&r2=602659&view=diff
==============================================================================
---
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
(original)
+++
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Sun Dec 9 03:05:19 2007
@@ -662,7 +662,7 @@
var doShow = function() {
// if there is a previous window
- if (typeof(this.oldWindow) != "undefined") {
+ if (this.oldWindow != null) {
// lower it's z-index so that it's moved under
the mask
this.oldWindow.window.style.zIndex =
Wicket.Window.Mask.zIndex - 1;
}
@@ -1226,7 +1226,7 @@
var doc = document;
var old = Wicket.Window.current.oldWindow;
- if (typeof(old) != "undefined") {
+ if (typeof(old) != "undefined" && old != null) {
doc = old.getContentDocument();
}
Modified:
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
URL:
http://svn.apache.org/viewvc/wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js?rev=602659&r1=602658&r2=602659&view=diff
==============================================================================
---
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
(original)
+++
wicket/releases/wicket-1.3.0-rc2/jdk-1.4/wicket/src/main/java/org/apache/wicket/ajax/wicket-ajax.js
Sun Dec 9 03:05:19 2007
@@ -169,7 +169,7 @@
}
}
-Wicket.replaceOuterHtmlIE = function(element, text) {
+Wicket.replaceOuterHtmlIE = function(element, text) {
if (element.tagName == "SCRIPT") {
// we need to get the javascript content, so we create an
invalid DOM structure,
@@ -186,17 +186,20 @@
var parent = element.parentNode;
var tn = element.tagName;
+
var tempDiv = document.createElement("div");
var tempParent;
// array for javascripts that were in the text
var scripts = new Array();
+
+ if (window.parent == window || window.parent == null) {
+ document.body.appendChild(tempDiv);
+ }
if (tn != 'TBODY' && tn != 'TR' && tn != "TD" && tn != "THEAD") {
- // in case the element is not any of these
-
- document.body.appendChild(tempDiv);
+ // in case the element is not any of these
// this is not exactly nice, but we need to get invalid markup
inside innerHTML,
// because otherwise IE just swallows the <script> tags
(sometimes)
@@ -208,8 +211,6 @@
for (var i = 0; i < s.length; ++i) {
scripts.push(s[i]);
}
-
- tempDiv.innerHTML = "";
// now use regular div so that we won't mess the DOM
tempDiv.innerHTML = '<div style="display:none">' + text +
'</div>';
@@ -232,8 +233,6 @@
scripts.push(s[i]);
}
- tempDiv.innerHTML = "";
-
// hack to get around the fact that IE doesn't allow to replace
table elements
tempDiv.innerHTML = '<table style="display: none">' + text +
'</table>';
@@ -252,8 +251,10 @@
// remove the original element
parent.removeChild(element);
- element.outerHTML = "";
+ element.outerHTML = "";
element = "";
+
+ document.body.removeChild(tempDiv);
tempDiv.outerHTML = "";
parent = null;
@@ -1983,4 +1984,4 @@
if (e!=null) {
e.style.display = "none";
}
-}
+}
\ No newline at end of file
