JBoss Rich Faces SVN: r14482 - branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-06-04 11:40:44 -0400 (Thu, 04 Jun 2009)
New Revision: 14482
Modified:
branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
Fix RF-7227
Modified: branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-06-04 15:40:37 UTC (rev 14481)
+++ branches/community/3.3.X/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-06-04 15:40:44 UTC (rev 14482)
@@ -96,6 +96,7 @@
class="rich-fileupload-hidden"
id="#{clientId}:file"
name="#{clientId}:file"
+ autocomplete="off"
onchange="return $('#{clientId}').component.add(this);"/>
</div>
<div id="#{clientId}:flashContainer" style="display:none"></div>
15 years, 7 months
JBoss Rich Faces SVN: r14481 - branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-06-04 11:40:37 -0400 (Thu, 04 Jun 2009)
New Revision: 14481
Modified:
branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
Log:
Fix RF-7227
Modified: branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx
===================================================================
--- branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2009-06-04 15:38:43 UTC (rev 14480)
+++ branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenu.jspx 2009-06-04 15:40:37 UTC (rev 14481)
@@ -41,7 +41,7 @@
<div style="width:#{component.width}; #{style}" class="rich-pmenu #{component.styleClass}"
id="#{clientId}"
x:passThruWithExclusions="style,width,class,styleClass,id">
- <input type="hidden" id="#{clientId}selectedItemName" name="#{clientId}selectedItemName" value="" />
+ <input autocomplete="off" type="hidden" id="#{clientId}selectedItemName" name="#{clientId}selectedItemName" value="" />
<vcp:body>
<f:call name="renderChildren" />
</vcp:body>
Modified: branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx
===================================================================
--- branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2009-06-04 15:38:43 UTC (rev 14480)
+++ branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuGroup.jspx 2009-06-04 15:40:37 UTC (rev 14481)
@@ -36,10 +36,10 @@
</f:call>
</td>
<td style="width:100%" id="icon#{clientId}" class="rich-pmenu-group-self-label #{this:getLabelClass( context, component )}" >
- <input type="hidden" name="panelMenuState#{clientId}"
+ <input type="hidden" autocomplete="off" name="panelMenuState#{clientId}"
value="#{isNodeOpened}" />
- <input type="hidden" name="panelMenuAction#{clientId}"
+ <input autocomplete="off" type="hidden" name="panelMenuAction#{clientId}"
value="" />
<f:call name="insertLabel"/>
</td>
Modified: branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx
===================================================================
--- branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2009-06-04 15:38:43 UTC (rev 14480)
+++ branches/community/3.3.X/ui/panelmenu/src/main/templates/org/richfaces/htmlPanelMenuItem.jspx 2009-06-04 15:40:37 UTC (rev 14481)
@@ -29,7 +29,7 @@
</f:call>
</td>
<td style="width:100%" id="icon#{clientId}" class="rich-pmenu-group-self-label #{this:getLabelClass( context, component )}" >
- <input type="hidden" name="panelMenuAction#{clientId}" value=""/>
+ <input type="hidden" autocomplete="off" name="panelMenuAction#{clientId}" value=""/>
<f:call name="insertLabel"/>
<vcp:body>
<f:call name="renderChildren" />
15 years, 7 months
JBoss Rich Faces SVN: r14480 - branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-06-04 11:38:43 -0400 (Thu, 04 Jun 2009)
New Revision: 14480
Modified:
branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
Log:
Fix RF-7205
Modified: branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2009-06-04 15:38:05 UTC (rev 14479)
+++ branches/community/3.3.X/ui/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2009-06-04 15:38:43 UTC (rev 14480)
@@ -286,8 +286,8 @@
Object value = getLocalValue();
if (value != null) {
ValueExpression ve = getValueExpression("value");
- if (ve != null) {
- FacesContext context = getFacesContext();
+ FacesContext context = getFacesContext();
+ if (ve != null && !ve.isReadOnly(context.getELContext())) {
try {
ve.setValue(context.getELContext(), value);
setValue(null);
15 years, 7 months
JBoss Rich Faces SVN: r14479 - in branches/community/3.3.X/ui/layout/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-06-04 11:38:05 -0400 (Thu, 04 Jun 2009)
New Revision: 14479
Modified:
branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
branches/community/3.3.X/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
Log:
Fix RF-7249
Modified: branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
--- branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-06-04 15:37:37 UTC (rev 14478)
+++ branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java 2009-06-04 15:38:05 UTC (rev 14479)
@@ -219,4 +219,7 @@
return null != component.getFacet(facet);
}
+ public boolean hasTitle(FacesContext context, UIComponent component) {
+ return component.getAttributes().get("pageTitle") != null && !component.getAttributes().get("pageTitle").toString().trim().equals("");
+ }
}
Modified: branches/community/3.3.X/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx
===================================================================
--- branches/community/3.3.X/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-06-04 15:37:37 UTC (rev 14478)
+++ branches/community/3.3.X/ui/layout/src/main/templates/org/richfaces/htmlPage.jspx 2009-06-04 15:38:05 UTC (rev 14479)
@@ -17,7 +17,9 @@
<html x:xmlns="#{namespace}" x:lang="#{context.viewRoot.locale}"
>
<head>
+ <c:if test="#{this:hasTitle(context,component)}">
<title>#{component.attributes['pageTitle']}</title>
+ </c:if>
<f:call name="themeStyle"/>
<f:call name="themeScript"/>
<f:call name="pageStyle"/>
15 years, 7 months
JBoss Rich Faces SVN: r14478 - branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-06-04 11:37:37 -0400 (Thu, 04 Jun 2009)
New Revision: 14478
Modified:
branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
Log:
Fix RF-7283
Modified: branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java
===================================================================
--- branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-06-04 12:48:56 UTC (rev 14477)
+++ branches/community/3.3.X/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractGridRenderer.java 2009-06-04 15:37:37 UTC (rev 14478)
@@ -115,7 +115,7 @@
writer.startElement(HTML.td_ELEM, table);
String columnClass = tableHolder.getColumnClass(i);
encodeStyleClass(writer, null, "rich-table-cell", null, columnClass);
- writer.writeText("\u00A0", null);//
+ writer.write(" ");//
writer.endElement(HTML.td_ELEM);
}
}
15 years, 7 months
JBoss Rich Faces SVN: r14477 - in branches/community/3.3.X/ui/tabPanel/src: main/resources/org/richfaces/renderkit/html/css and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-06-04 08:48:56 -0400 (Thu, 04 Jun 2009)
New Revision: 14477
Modified:
branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabClassBuilder.java
branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx
branches/community/3.3.X/ui/tabPanel/src/main/templates/tabHeader.jspx
branches/community/3.3.X/ui/tabPanel/src/main/templates/tabPanel.jspx
branches/community/3.3.X/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
Log:
RF-7318
Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabClassBuilder.java
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabClassBuilder.java 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabClassBuilder.java 2009-06-04 12:48:56 UTC (rev 14477)
@@ -38,8 +38,7 @@
public static final TabClassBuilder activeTabClassBuilder = new TabClassBuilder() {
protected String getSpecificClassForAllTabs() {
- //dr-tb-act
- return "dr-tbpnl-tb-act rich-tab-active";
+ return "rich-tab-active";
}
protected String getSpecificTabClassFromPane(UITab tab,
@@ -53,8 +52,7 @@
public static final TabClassBuilder disabledTabClassBuilder = new TabClassBuilder() {
protected String getSpecificClassForAllTabs() {
- //dr-tb-dsbld
- return "dr-tbpnl-tb-dsbl rich-tab-disabled";
+ return "rich-tab-disabled";
}
protected String getSpecificTabClassFromPane(UITab tab,
@@ -68,8 +66,7 @@
public static final TabClassBuilder inactiveTabClassBuilder = new TabClassBuilder() {
protected String getSpecificClassForAllTabs() {
- //dr-tb-inact
- return "dr-tbpnl-tb-inact rich-tab-inactive";
+ return "rich-tab-inactive";
}
protected String getSpecificTabClassFromPane(UITab tab,
@@ -123,8 +120,7 @@
* @return
*/
protected String getCommonClassForAllTabs() {
- //dr-tb-cntrl
- return "dr-tbpnl-tb rich-tab-header";
+ return "rich-tab-header";
}
/**
Modified: branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2009-06-04 12:48:56 UTC (rev 14477)
@@ -55,9 +55,9 @@
*/
public class TabPanelRendererBase extends org.ajax4jsf.renderkit.HeaderResourcesRendererBase {
- public final static String ACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-act rich-tabhdr-cell-active";
- public final static String INACTIVE_CELL_CLASSES = "dr-tbpnl-tbcell-inact rich-tabhdr-cell-inactive";
- public final static String DISABLED_CELL_CLASSES = "dr-tbpnl-tbcell-dsbld rich-tabhdr-cell-disabled";
+ public final static String ACTIVE_CELL_CLASSES = "rich-tabhdr-cell-active";
+ public final static String INACTIVE_CELL_CLASSES = "rich-tabhdr-cell-inactive";
+ public final static String DISABLED_CELL_CLASSES = "rich-tabhdr-cell-disabled";
private final String TABS_WITH_SAME_NAMES_ERROR = "tabs with the same name not allowed";
protected Class getComponentClass() {
Modified: branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/css/tabPanel.xcss 2009-06-04 12:48:56 UTC (rev 14477)
@@ -4,65 +4,13 @@
xmlns:u="http://jsf.exadel.com/template/util"
xmlns="http://www.w3.org/1999/xhtml">
-<!--
<f:verbatim>
-.dr-tb-ctrl{
- position: relative;
-}
-.dr-tb-act{
- top: 1px;
-}
-.dr-tb-inact, .dr-tb-dsbld{
- top: 0px;
-}
-.dr-tb-inact *, .dr-tb-inact-ovr * {
- cursor: pointer !important;
-}
-
-.dr-tb-act td.dr-tb-bd {
- padding: 3px 5px 5px 5px;
- text-align: center;
- cursor: default;
- width: auto;
- white-space: nowrap;
- font-weight: bold;
-}
-
-.dr-tb-inact td.dr-tb-bd {
- padding: 3px 5px 0px 5px;
- text-align: center;
- cursor: pointer;
- width: auto;
- white-space: nowrap;
-}
-
-.dr-tb-inact-ovr td.dr-tb-bd {
- padding: 3px 5px 0px 5px;
- text-align: center;
- cursor: pointer;
- width: auto;
- white-space: nowrap;
-}
-
-.dr-tb-dsbld td.dr-tb-bd {
- padding: 3px 5px 0px 5px;
- text-align: center;
- cursor: default;
- width: auto;
- white-space: nowrap;
-}
-
-</f:verbatim>
--->
-
-<f:verbatim>
-
.rich-tabpanel{
width:100%;
}
-.dr-tbpnl-cntnt {
+.rich-tabpanel-content {
border-bottom-width: 1px;
border-bottom-style: solid;
border-left-width: 1px;
@@ -72,22 +20,22 @@
vertical-align: top;
}
-.dr-tbpnl-tbtopbrdr{
+.rich-tabhdr-side-cell {
border-top-width: 1px;
border-top-style: solid;
}
-.dr-tbpnl-tb{
+.rich-tab-header{
padding : 2px 10px 2px 10px;
text-align: center;
}
-.dr-tbpnl-tbbrdr{
+.rich-tabhdr-side-border{
background-repeat: no-repeat;
background-position: top;
}
-.dr-tbpnl-tb-act{
+.rich-tab-active{
border-width: 1px;
border-style: solid;
padding : 3px 10px 4px 10px;
@@ -97,38 +45,42 @@
cursor : default;
}
-.dr-tbpnl-tb-dsbld {
- border-width: 1px;
- border-style: solid;
+.rich-tab-disabled {
background-repeat: repeat-x;
- background-position: top;
+ background-position: center top;
+ border-width: 1px 1px 0px;
+ border-style: solid;
cursor : default;
}
-.dr-tbpnl-tbcell-dsbld, .dr-tbpnl-tbcell-inact {
+.rich-tabhdr-cell-disabled, .rich-tabhdr-cell-inactive {
padding-top: 2px;
}
</f:verbatim>
- <u:selector name=".dr-tbpnl-tb">
+ <u:selector name=".rich-tab-header">
<u:style name="color" skin="generalTextColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".dr-tbpnl-tb-act">
+ <u:selector name=".rich-tab-active">
<u:style name="color" skin="generalTextColor"/>
<u:style name="border-color" skin="subBorderColor"/>
</u:selector>
- <u:selector name=".dr-tbpnl-tb-dsbl">
+ <u:selector name=".rich-tab-disabled">
<u:style name="border-color" skin="subBorderColor"/>
<u:style name="color" skin="tabDisabledTextColor"/>
+ <u:style name="background-color" skin="tabBackgroundColor" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
+ </u:style>
</u:selector>
<f:verbatim>
-.dr-tbpnl-tb-sel {
+.rich-tbpnl-tb-sel {
border-width: 1px;
border-style: solid;
border-bottom : 0px;
@@ -136,13 +88,8 @@
background-position: top;
cursor : default;
}
-
-.dr-tbpnl-tb-dsbl {
- background-repeat: repeat-x;
- background-position: center top;
-}
-.dr-tbpnl-cntnt-pstn {
+.rich-tabpanel-content-position {
height:100%;
position: relative;
}
@@ -150,13 +97,16 @@
<u:selector name=".dr-tbpnl-tb-sel">
<u:style name="border-color" skin="selectControlColor"/>
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
+ </u:style>
</u:selector>
- <u:selector name=".dr-tbpnl-tbtopbrdr">
+ <u:selector name=".rich-tabhdr-side-cell">
<u:style name="border-top-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".dr-tbpnl-cntnt">
+ <u:selector name=".rich-tabpanel-content">
<u:style name="background-color" skin="generalBackgroundColor"/>
<u:style name="color" skin="generalTextColor"/>
<u:style name="border-bottom-color" skin="panelBorderColor"/>
@@ -166,18 +116,11 @@
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
- <u:selector name=".dr-tbpnl-tb-dsbl">
+ <u:selector name=".rich-tab-inactive">
<u:style name="background-color" skin="tabBackgroundColor" />
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
</u:style>
- </u:selector>
-
- <u:selector name=".dr-tbpnl-tb-inact">
- <u:style name="background-color" skin="tabBackgroundColor" />
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
- </u:style>
<u:style name="border-color" skin="subBorderColor"/>
<u:style name="border-width" value="1px"/>
@@ -190,31 +133,23 @@
</u:selector>
- <u:selector name=".dr-bottom-line">
+ <u:selector name=".rich-tab-bottom-line">
<u:style name="border-bottom-color" skin="panelBorderColor"/>
<u:style name="border-bottom-style" value="solid"/>
<u:style name="border-bottom-width" value="1px"/>
</u:selector>
- <u:selector name=".dr-tbpnl-tb-act">
+ <u:selector name=".rich-tab-active">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.TabGradientA" />
</u:style>
<u:style name="background-color" skin="generalBackgroundColor" />
</u:selector>
- <u:selector name=".dr-tbpnl-tbbrdr">
+ <u:selector name=".rich-tabhdr-side-border">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.TabStripeImage"/>
</u:style>
- </u:selector>
-
- <u:selector name=".dr-tbpnl-tb-sel">
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.images.TabGradientB" />
- </u:style>
- <u:style name="border-color" skin="selectControlColor" />
- </u:selector>
-
+ </u:selector>
</f:template>
\ No newline at end of file
Modified: branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js 2009-06-04 12:48:56 UTC (rev 14477)
@@ -134,17 +134,17 @@
RichFaces.overTab = function(tab) {
if (RichFaces._shouldHoverTab(tab)) {
- Element.addClassName(tab, 'dr-tbpnl-tb-sel');
+ Element.addClassName(tab, 'rich-tbpnl-tb-sel');
}
}
RichFaces.outTab = function(tab) {
if (RichFaces._shouldHoverTab(tab)) {
- Element.removeClassName(tab, 'dr-tbpnl-tb-sel');
+ Element.removeClassName(tab, 'rich-tbpnl-tb-sel');
}
}
RichFaces._shouldHoverTab = function(tab) {
- return (tab.className.indexOf('dr-tbpnl-tb-act') < 0);
+ return (tab.className.indexOf('rich-tab-active') < 0);
}
RichFaces.onTabChange = function(event, pane,tab) {
Modified: branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/templates/tab.jspx 2009-06-04 12:48:56 UTC (rev 14477)
@@ -16,9 +16,9 @@
<td id="#{clientId}" style="#{this:getTabDisplay(context, component)};height:100%"
>
- <table border="0" cellpadding="10" cellspacing="0" width="100%" class="dr-tbpnl-cntnt-pstn rich-tabpanel-content-position" style="">
+ <table border="0" cellpadding="10" cellspacing="0" width="100%" class="rich-tabpanel-content-position" style="">
<tr>
- <td class="dr-tbpnl-cntnt rich-tabpanel-content #{component.pane.attributes['contentClass']} #{component.attributes['styleClass']}"
+ <td class="rich-tabpanel-content #{component.pane.attributes['contentClass']} #{component.attributes['styleClass']}"
style="#{component.pane.attributes['contentStyle']}; #{component.attributes['style']}"
x:passThruWithExclusions="class,style,styleClass,id"
>
Modified: branches/community/3.3.X/ui/tabPanel/src/main/templates/tabHeader.jspx
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/templates/tabHeader.jspx 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/templates/tabHeader.jspx 2009-06-04 12:48:56 UTC (rev 14477)
@@ -20,8 +20,8 @@
<f:call name="encodeTabLabel" />
<tr>
- <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" style="border:0" /></td>
- <td class="dr-tbpnl-tbtopbrdr rich-tabhdr-side-cell" style="#{this:encodeTabLabelWidth(context, component)}">
+ <td class="rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" style="border:0" /></td>
+ <td class="rich-tabhdr-side-cell" style="#{this:encodeTabLabelWidth(context, component)}">
<table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0" >
<tr>
<td id="#{clientId}_lbl"
@@ -40,7 +40,7 @@
</tr>
</table>
</td>
- <td class="dr-tbpnl-tbbrdr rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" style="border:0" /></td>
+ <td class="rich-tabhdr-side-border"><img src="#{spacer}" width="1" height="1" alt="" style="border:0" /></td>
</tr>
</table>
Modified: branches/community/3.3.X/ui/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/main/templates/tabPanel.jspx 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/main/templates/tabPanel.jspx 2009-06-04 12:48:56 UTC (rev 14477)
@@ -35,7 +35,7 @@
<tbody>
<tr>
- <td align="#{component.attributes['headerAlignment']}" class="dr-bottom-line rich-tab-bottom-line #{component.attributes['headerClass']}">
+ <td align="#{component.attributes['headerAlignment']}" class="rich-tab-bottom-line #{component.attributes['headerClass']}">
<f:call name="utils.encodeBeginFormIfNessesary" />
<!--table border="0" cellpadding="0" cellspacing="0" style="position:relative;top:1px"-->
<table border="0" cellpadding="0" cellspacing="0">
Modified: branches/community/3.3.X/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2009-06-04 12:48:06 UTC (rev 14476)
+++ branches/community/3.3.X/ui/tabPanel/src/test/java/org/richfaces/component/TabPanelComponentTest.java 2009-06-04 12:48:56 UTC (rev 14477)
@@ -128,7 +128,6 @@
assertEquals("td", cell1.getNodeName());
String classAttr1 = cell1.getAttributeValue("class");
- assertTrue(classAttr1.contains("dr-tbpnl-tbcell-act"));
assertTrue(classAttr1.contains("rich-tabhdr-cell-active"));
HtmlElement label1 = page.getHtmlElementById(tab1.getClientId(facesContext) + "_lbl");
@@ -139,9 +138,7 @@
assertEquals("RichFaces.outTab(this);", label1.getAttributeValue("onmouseout"));
String classAttrL1 = label1.getAttributeValue("class");
- assertTrue(classAttrL1.contains("dr-tbpnl-tb"));
assertTrue(classAttrL1.contains("rich-tab-header"));
- assertTrue(classAttrL1.contains("dr-tbpnl-tb-act"));
assertTrue(classAttrL1.contains("rich-tab-active"));
HtmlElement cell2 = page.getHtmlElementById(tab2.getClientId(facesContext) + "_cell");
@@ -149,7 +146,6 @@
assertEquals("td", cell2.getNodeName());
String classAttr2 = cell2.getAttributeValue("class");
- assertTrue(classAttr2.contains("dr-tbpnl-tbcell-inact"));
assertTrue(classAttr2.contains("rich-tabhdr-cell-inactive"));
HtmlElement label2 = page.getHtmlElementById(tab2.getClientId(facesContext) + "_lbl");
@@ -160,9 +156,7 @@
assertEquals("RichFaces.outTab(this);", label1.getAttributeValue("onmouseout"));
String classAttrL2 = label2.getAttributeValue("class");
- assertTrue(classAttrL2.contains("dr-tbpnl-tb"));
assertTrue(classAttrL2.contains("rich-tab-header"));
- assertTrue(classAttrL2.contains("dr-tbpnl-tb-inact"));
assertTrue(classAttrL2.contains("rich-tab-inactive"));
HtmlElement tab = page.getHtmlElementById(tab1.getClientId(facesContext));
15 years, 7 months
JBoss Rich Faces SVN: r14476 - branches/community/3.3.X/docs/common-resources/en/src/main/script.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2009-06-04 08:48:06 -0400 (Thu, 04 Jun 2009)
New Revision: 14476
Modified:
branches/community/3.3.X/docs/common-resources/en/src/main/script/toggle.js
Log:
https://jira.jboss.org/jira/browse/RF-7213 - bug in JavaScript was fixed
Modified: branches/community/3.3.X/docs/common-resources/en/src/main/script/toggle.js
===================================================================
--- branches/community/3.3.X/docs/common-resources/en/src/main/script/toggle.js 2009-06-04 10:57:55 UTC (rev 14475)
+++ branches/community/3.3.X/docs/common-resources/en/src/main/script/toggle.js 2009-06-04 12:48:06 UTC (rev 14476)
@@ -1,18 +1,13 @@
var inputCorrect = false;
var textCorrect = false;
-function getPlace(){
- if(navigator.appName=="Microsoft Internet Explorer" && parseFloat(navigator.appVersion) < 7){
- document.getElementById('place').style.display = "block";
- }
-}
-
+
function showPopup(_popupId) {
document.getElementById(_popupId).style.display = "block";
document.getElementById('timeOutDiv').style.display = "block";
document.getElementById("feedback-maincontainer").style.display = "block";
document.getElementById("guide_words").style.display = "block";
- getPlace();
+
}
function hidePopup(_popupId, form, iFrame, but, container) {
@@ -24,8 +19,8 @@
document.getElementById(container).style.left="30%";
document.getElementById(container).style.top="20%";
document.getElementById(container).style.width="500px";
- document.getElementById(container).style.height="440px";
- getPlace();
+ document.getElementById(container).style.height="440px";
+
}
function showIFrame(form, iFrame, but, container){
15 years, 7 months
JBoss Rich Faces SVN: r14475 - in branches/community/3.3.X/test-applications/regressionArea: regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951 and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2009-06-04 06:57:55 -0400 (Thu, 04 Jun 2009)
New Revision: 14475
Added:
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951/Bean.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6951/
branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6951/Test.java
branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6951.xhtml
Log:
+RF-6951 selenium test.
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951/Bean.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951/Bean.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-ejb/src/main/java/org/richfaces/regressionarea/issues/rf6951/Bean.java 2009-06-04 10:57:55 UTC (rev 14475)
@@ -0,0 +1,82 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.regressionarea.issues.rf6951;
+
+import java.util.Arrays;
+
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
+
+/**
+ * This test case for: <a href="https://jira.jboss.org/jira/browse/RF-6267">RF-6951 -
+ * List shuttle causes "invalid value expression" error.</a>
+ *
+ * @author Mikhail Vitenkov
+ * @since 3.3.2
+ */
+@Name("rf6951")
+(a)Scope(ScopeType.SESSION)
+public class Bean {
+
+ private String[] availableLine = { "Line 1", "Line 2", "Line 3" };
+ private String[] selectedLine = {};
+ private String available;
+ private String selected;
+
+ public Bean(){
+
+ }
+
+ public String[] getAvailableLine() {
+ return availableLine;
+ }
+
+ public void setAvailableLine(String[] availableLine) {
+ this.availableLine = availableLine;
+ available = Arrays.toString(availableLine);
+ }
+
+ public String[] getSelectedLine() {
+ return selectedLine;
+ }
+
+ public void setSelectedLine(String[] selectedLine) {
+ this.selectedLine = selectedLine;
+ selected = Arrays.toString(selectedLine);
+ }
+
+ public String getAvailable() {
+ return available;
+ }
+
+ public void setAvailable(String available) {
+ this.available = available;
+ }
+
+ public String getSelected() {
+ return selected;
+ }
+
+ public void setSelected(String selected) {
+ this.selected = selected;
+ }
+}
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6951/Test.java
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6951/Test.java (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-tests/src/test/java/org/richfaces/testng/rf6951/Test.java 2009-06-04 10:57:55 UTC (rev 14475)
@@ -0,0 +1,47 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+package org.richfaces.testng.rf6951;
+
+import org.richfaces.SeleniumTestBase;
+
+/**
+ * @author Mikhail Vitenkov
+ * @since 3.3.2
+ */
+public class Test extends SeleniumTestBase {
+
+ @org.testng.annotations.Test
+ public void testExecute() throws Exception {
+ renderPage();
+
+ selenium.doubleClick("//*[@id='form:LineConfigs:0']");
+ selenium.click("//form[@id='form']/input[@type='button' and @value='Submit']");
+ waitForAjaxCompletion();
+
+ AssertTextEquals("//table[@id='form:panel']/tbody/tr[1]/td[2]", "[Line 2, Line 3]");
+ AssertTextEquals("//table[@id='form:panel']/tbody/tr[2]/td[2]", "[Line 1]");
+ }
+
+ @Override
+ public String getTestUrl() {
+ return "pages/rf6951.xhtml";
+ }
+}
\ No newline at end of file
Added: branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6951.xhtml
===================================================================
--- branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6951.xhtml (rev 0)
+++ branches/community/3.3.X/test-applications/regressionArea/regressionArea-web/src/main/webapp/pages/rf6951.xhtml 2009-06-04 10:57:55 UTC (rev 14475)
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich">
+
+<ui:composition template="/layout/layout.xhtml">
+ <ui:define name="template">
+ <h:form id="form">
+ <rich:listShuttle id="LineConfigs"
+ sourceValue="#{rf6951.availableLine}"
+ targetValue="#{rf6951.selectedLine}" var="variable"
+ sourceListWidth="280" listsHeight="250" targetListWidth="280">
+
+ <rich:column>
+ <h:outputText value="#{variable}" />
+ </rich:column>
+
+ </rich:listShuttle>
+
+ <a4j:commandButton value="Submit" reRender="panel"/>
+ <h:panelGrid columns="2" id="panel">
+ <h:outputText value="Available:" />
+ <h:outputText value="#{rf6951.available}" />
+ <h:outputText value="Selected:" />
+ <h:outputText value="#{rf6951.selected}" />
+ </h:panelGrid>
+ </h:form>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
15 years, 7 months
JBoss Rich Faces SVN: r14474 - branches/community/3.3.X/test-applications/richfaces-docs.
by richfaces-svn-commits＠lists.jboss.org
Author: msorokin
Date: 2009-06-04 06:06:11 -0400 (Thu, 04 Jun 2009)
New Revision: 14474
Modified:
branches/community/3.3.X/test-applications/richfaces-docs/pom.xml
Log:
Modified: branches/community/3.3.X/test-applications/richfaces-docs/pom.xml
===================================================================
--- branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2009-06-04 10:05:52 UTC (rev 14473)
+++ branches/community/3.3.X/test-applications/richfaces-docs/pom.xml 2009-06-04 10:06:11 UTC (rev 14474)
@@ -149,7 +149,7 @@
<artifactId>richfaces-api</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.2-SNAPSHOT</version>
</dependency>
@@ -159,7 +159,7 @@
<artifactId>richfaces-impl</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.2-SNAPSHOT</version>
</dependency>
@@ -169,9 +169,20 @@
<artifactId>richfaces-ui</artifactId>
- <version>3.3.1-SNAPSHOT</version>
+ <version>3.3.2-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
+
+
+ <form action="handler.php">
+ <p><select multiple size="1">
+ <option>���������</option>
+ <option>�������� ����</option>
+ <option>��������</option>
+ <option>����� ������</option>
+ </select></p>
+ </form>
+
15 years, 7 months