You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/06/30 13:12:26 UTC
svn commit: r418238 - in /myfaces/tobago/trunk/theme/scarborough/src/main:
java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/
Author: weber
Date: Fri Jun 30 04:12:25 2006
New Revision: 418238
URL: http://svn.apache.org/viewvc?rev=418238&view=rev
Log:
fix for TOBAGO-88 (Warning page contains secure and nonsecure items on IE when using https)
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java?rev=418238&r1=418237&r2=418238&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PopupRenderer.java Fri Jun 30 04:12:25 2006
@@ -91,6 +91,7 @@
writer.writeIdAttribute(clientId + SUBCOMPONENT_SEP + "iframe");
writer.writeClassAttribute("tobago-popup-iframe");
writer.writeAttribute("style", contentStyle.toString(), null);
+ writer.writeAttribute("src", "javascript:false;", null);
writer.endElement("iframe");
}
writer.startElement("div", component);
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js?rev=418238&r1=418237&r2=418238&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js Fri Jun 30 04:12:25 2006
@@ -150,6 +150,7 @@
html += '<iframe'
+ ' id="' + this.id + Tobago.SUB_COMPONENT_SEP + 'iframe"'
+ ' class="tobago-menuBar-subitem-iframe" '
+ + ' src="javascript:false;" '
+ ' style="display: none; visibility: hidden;"'
+ ' frameborder="0" scrolling="no" ></iframe>';
}