Author: jcompagner
Date: Mon Jun 20 09:17:41 2011
New Revision: 1137556
URL: http://svn.apache.org/viewvc?rev=1137556&view=rev
Log:
ModalWindow does not work in Opera 11.10 and MSIE 6
Issue: WICKET-3615
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=1137556&r1=1137555&r2=1137556&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Mon Jun 20 09:17:41 2011
@@ -1161,13 +1161,11 @@ Wicket.Window.getMarkup = function(idWin
"<div
class=\"w_content_3\">"+
"<div
class=\"w_content\">";
if (isFrame) {
- if (Wicket.Browser.isIELessThan7() ||
!Wicket.Browser.isIE()) {
- s+= "<iframe src='\/\/:'
frameborder=\"0\" id='"+idContent+"' allowtransparency=\"false\"
style=\"height: 200px\">"+
-
"</iframe>";
- } else {
- s+= "<iframe src='about:blank'
frameborder=\"0\" id='"+idContent+"' allowtransparency=\"false\"
style=\"height: 200px\">"+
- "</iframe>";
- }
+ s+= "<iframe";
+ if (Wicket.Browser.isIELessThan7()) {
+ s+= " src=\"about:blank\""
+ }
+ s+= " frameborder=\"0\"
id=\""+idContent+"\" allowtransparency=\"false\" style=\"height: 200px\"
class=\"wicket_modal\"></iframe>";
} else {
s+=
"<div id='"+idContent+"' class='w_content_container'></div>";
