You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/04/17 17:31:14 UTC
svn commit: r1094159 -
/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Author: jdonnerstag
Date: Sun Apr 17 15:31:14 2011
New Revision: 1094159
URL: http://svn.apache.org/viewvc?rev=1094159&view=rev
Log:
fixed: ModalWindow does not work in Opera 11.10 and MSIE 6
Issue: WICKET-3615
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=1094159&r1=1094158&r2=1094159&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js Sun Apr 17 15:31:14 2011
@@ -1191,13 +1191,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\" class=\"wicket_modal\">"+
- "</iframe>";
- } else {
- s+= "<iframe src='about:blank' frameborder=\"0\" id='"+idContent+"' allowtransparency=\"false\" style=\"height: 200px\" class=\"wicket_modal\">"+
- "</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>";
Re: svn commit: r1094159 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Posted by Attila Király <ki...@gmail.com>.
I tought so too, so I tested my patch with https too and it worked. IE6 gave
a warning about page containing non secure content but it is complaining
with the original version too.
Attila
2011/4/17 Martin Grigorov <mg...@apache.org>
> As far as I remember src='\/\/:' was used to be able to work in https envs
> too
>
> On Sun, Apr 17, 2011 at 6:31 PM, <jd...@apache.org> wrote:
>
> > Author: jdonnerstag
> > Date: Sun Apr 17 15:31:14 2011
> > New Revision: 1094159
> >
> > URL: http://svn.apache.org/viewvc?rev=1094159&view=rev
> > Log:
> > fixed: ModalWindow does not work in Opera 11.10 and MSIE 6
> > Issue: WICKET-3615
> >
> > Modified:
> >
> >
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> >
> > Modified:
> >
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> > URL:
> >
> http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=1094159&r1=1094158&r2=1094159&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> > (original)
> > +++
> >
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> > Sun Apr 17 15:31:14 2011
> > @@ -1191,13 +1191,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\" class=\"wicket_modal\">"+
> > -
> > "</iframe>";
> > - } else {
> > - s+= "<iframe
> > src='about:blank' frameborder=\"0\" id='"+idContent+"'
> > allowtransparency=\"false\" style=\"height: 200px\"
> > class=\"wicket_modal\">"+
> > - "</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>";
> >
> >
> >
>
>
> --
> Martin Grigorov
> jWeekend
> Training, Consulting, Development
> http://jWeekend.com <http://jweekend.com/>
>
Re: svn commit: r1094159 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
Posted by Martin Grigorov <mg...@apache.org>.
As far as I remember src='\/\/:' was used to be able to work in https envs
too
On Sun, Apr 17, 2011 at 6:31 PM, <jd...@apache.org> wrote:
> Author: jdonnerstag
> Date: Sun Apr 17 15:31:14 2011
> New Revision: 1094159
>
> URL: http://svn.apache.org/viewvc?rev=1094159&view=rev
> Log:
> fixed: ModalWindow does not work in Opera 11.10 and MSIE 6
> Issue: WICKET-3615
>
> Modified:
>
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
>
> Modified:
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> URL:
> http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js?rev=1094159&r1=1094158&r2=1094159&view=diff
>
> ==============================================================================
> ---
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> (original)
> +++
> wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/res/modal.js
> Sun Apr 17 15:31:14 2011
> @@ -1191,13 +1191,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\" class=\"wicket_modal\">"+
> -
> "</iframe>";
> - } else {
> - s+= "<iframe
> src='about:blank' frameborder=\"0\" id='"+idContent+"'
> allowtransparency=\"false\" style=\"height: 200px\"
> class=\"wicket_modal\">"+
> - "</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>";
>
>
>
--
Martin Grigorov
jWeekend
Training, Consulting, Development
http://jWeekend.com <http://jweekend.com/>