You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/02/09 09:33:23 UTC
svn commit: r620090 - in /myfaces/tobago/branches/tobago-1.0.x: ./
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarboro...
Author: bommel
Date: Sat Feb 9 00:33:22 2008
New Revision: 620090
URL: http://svn.apache.org/viewvc?rev=620090&view=rev
Log:
Merged revisions 620088 via svnmerge from
https://svn.apache.org/repos/asf/myfaces/tobago/trunk
........
r620088 | bommel | 2008-02-09 09:27:46 +0100 (Sa, 09 Feb 2008) | 1 line
(TOBAGO-619) Avoid usages of javascript:false in iframe src attribute
........
Modified:
myfaces/tobago/branches/tobago-1.0.x/ (props changed)
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js
Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 9 00:33:22 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717,617876,618327,619122,619133,619933,619936,619947-619962
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278,614291,614642,615257,616717,617876,618327,619122,619133,619933,619936,619947-619962,620088
Modified: myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java?rev=620090&r1=620089&r2=620090&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ObjectRenderer.java Sat Feb 9 00:33:22 2008
@@ -40,7 +40,6 @@
if (src != null) {
writer.writeAttribute(HtmlAttributes.SRC, String.valueOf(src), true);
} else {
- //writer.writeAttribute(HtmlAttributes.SRC, "javascript:false;", false);
writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtil.getBlankPage(facesContext), false);
}
writer.writeClassAttribute();
Modified: myfaces/tobago/branches/tobago-1.0.x/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/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js?rev=620090&r1=620089&r2=620090&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js (original)
+++ myfaces/tobago/branches/tobago-1.0.x/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/script/tobago-menu.js Sat Feb 9 00:33:22 2008
@@ -158,7 +158,7 @@
html += '<iframe'
+ ' id="' + this.id + Tobago.SUB_COMPONENT_SEP + 'iframe"'
+ ' class="tobago-menuBar-subitem-iframe" '
- + ' src="javascript:false;" '
+ + ' src="/org/apache/myfaces/tobago/renderkit/html/standard/blank.html" '
//+ ' style="display: none; "'
+ ' style="visibility: hidden;"'
+ ' frameborder="0" scrolling="no" ></iframe>';