JBoss Rich Faces SVN: r109 - trunk/richfaces/inputnumber-slider/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-21 06:57:43 -0400 (Wed, 21 Mar 2007)
New Revision: 109
Modified:
trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
Log:
RFA-322 fixed. I am add "color: gray;" in textinput if disabled slider
Modified: trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
--- trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-03-21 09:16:21 UTC (rev 108)
+++ trunk/richfaces/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2007-03-21 10:57:43 UTC (rev 109)
@@ -47,8 +47,13 @@
variables.setVariable("inputReadOnly",
new Boolean(!manualInput || disabled));
+ if (!manualInput || disabled){
+ variables.setVariable("color", "color: gray;");
+ }
+ else{
+ variables.setVariable("color", "");
+ }
-
//if (showInput || manualInput) {
if (showInput) {
]]></jsp:scriptlet>
@@ -57,7 +62,7 @@
value="#{this:getInputValue(context,component)}"
type="text"
class="dr-insldr-field rich-inslider-field #{component.attributes['inputClass']}"
- style="#{component.attributes['inputStyle']}"
+ style="#{component.attributes['inputStyle']} #{color}"
readonly="#{inputReadOnly}"
onselect="#{component.attributes['onselect']}"
accesskey="#{component.attributes['accesskey']}"
18 years, 6 months
JBoss Rich Faces SVN: r108 - in trunk/richfaces-samples/datascroller-sample/src/main: webapp/WEB-INF and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-21 05:16:21 -0400 (Wed, 21 Mar 2007)
New Revision: 108
Modified:
trunk/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java
trunk/richfaces-samples/datascroller-sample/src/main/webapp/WEB-INF/faces-config.xml
trunk/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp
Log:
Modified: trunk/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java
===================================================================
--- trunk/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-03-21 08:15:58 UTC (rev 107)
+++ trunk/richfaces-samples/datascroller-sample/src/main/java/org/richfaces/TestBean.java 2007-03-21 09:16:21 UTC (rev 108)
@@ -27,15 +27,78 @@
public class TestBean {
private ArrayList data;
+ private ArrayList data1;
+ private ArrayList data2;
+ private ArrayList data3;
+ private ArrayList data4;
+ private ArrayList data5;
+ private ArrayList data6;
+ public boolean renderIfSinglePage;
+ public int rows;
+ public int maxpage;
+
public TestBean () {
+ renderIfSinglePage=true;
+
+ renderIfSinglePage=true;
+ rows=5;
+ maxpage=10;
+
data = new ArrayList();
- for (int i = 0; i < 10; i++)
- data.add(new Entry(null,i));
+ for (int i = 0; i < 10; i++) data.add(new Entry(null,i));
+
+ data1 = new ArrayList();
+ for (int i = 0; i < 11; i++) data1.add(new Entry(null,i));
+
+ data2 = new ArrayList();
+ for (int i = 0; i < 12; i++) data2.add(new Entry(null,i));
+
+ data3 = new ArrayList();
+ for (int i = 0; i < 13; i++) data3.add(new Entry(null,i));
+
+ data4 = new ArrayList();
+ for (int i = 0; i < 14; i++) data4.add(new Entry(null,i));
+
+ data5 = new ArrayList();
+ for (int i = 0; i < 15; i++) data5.add(new Entry(null,i));
+
+ data6 = new ArrayList();
+ for (int i = 0; i < 16; i++) data6.add(new Entry(null,i));
+
+
}
-
+ public void setRenderIfSinglePage(boolean renderIfSinglePage){
+ this.renderIfSinglePage = renderIfSinglePage;
+ }
+
+ public boolean isRenderIfSinglePage() {
+ return this.renderIfSinglePage;
+ }
+
+ public void setRows(int rows){
+
+ this.rows = rows;
+ }
+
+ public int getRows() {
+
+ return this.rows;
+ }
+
+ public void setMaxpage(int maxpage){
+
+ this.maxpage = maxpage;
+ }
+
+ public int getMaxpage() {
+ return this.maxpage;
+ }
+
+
+
public void doScroll(DataScrollerEvent event) {
String oldScrolVal = event.getOldScrolVal();
@@ -55,4 +118,61 @@
this.data = data;
}
+
+ public ArrayList getData1() {
+ return data1;
+ }
+
+
+
+ public void setData1(ArrayList data) {
+ this.data1 = data;
+ }
+ public ArrayList getData2() {
+ return data2;
+ }
+
+
+
+ public void setData2(ArrayList data) {
+ this.data2 = data;
+ }
+ public ArrayList getData3() {
+ return data3;
+ }
+
+
+
+ public void setData3(ArrayList data) {
+ this.data3 = data;
+ }
+ public ArrayList getData4() {
+ return data4;
+ }
+
+
+
+ public void setData4(ArrayList data) {
+ this.data4 = data;
+ }
+ public ArrayList getData5() {
+ return data5;
+ }
+
+
+
+ public void setData5(ArrayList data) {
+ this.data5 = data;
+ }
+
+ public ArrayList getData6() {
+ return data6;
+ }
+
+
+
+ public void setData6(ArrayList data) {
+ this.data6 = data;
+ }
+
}
Modified: trunk/richfaces-samples/datascroller-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/richfaces-samples/datascroller-sample/src/main/webapp/WEB-INF/faces-config.xml 2007-03-21 08:15:58 UTC (rev 107)
+++ trunk/richfaces-samples/datascroller-sample/src/main/webapp/WEB-INF/faces-config.xml 2007-03-21 09:16:21 UTC (rev 108)
@@ -5,7 +5,7 @@
<managed-bean>
<managed-bean-name>testBean</managed-bean-name>
<managed-bean-class>org.richfaces.TestBean</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
<managed-bean>
<managed-bean-name>skinBean</managed-bean-name>
Modified: trunk/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-03-21 08:15:58 UTC (rev 107)
+++ trunk/richfaces-samples/datascroller-sample/src/main/webapp/pages/index.jsp 2007-03-21 09:16:21 UTC (rev 108)
@@ -17,11 +17,16 @@
<h:selectOneRadio binding="#{skinBean.component}" />
<h:commandLink action="#{skinBean.change}" value="set skin" />
<br/><br/>
-
+
+
+
<h:outputText value="Data Table test" />
<br />
- <h:dataTable rows="2" id="master" border="1" value="#{testBean.data}" var="data">
+
+
+
+ <h:dataTable rows="#{testBean.rows}" id="master" border="1" value="#{testBean.data}" var="data">
<f:facet name="header">
<h:outputText value="My table" />
</f:facet>
@@ -53,10 +58,30 @@
</f:facet>
</h:column>
<f:facet name="footer">
- <ds:datascroller scrollerListener="#{testBean.doScroll}" maxPages="20"/>
+ <ds:datascroller for="master" rendered="true" renderIfSinglePage="#{testBean.renderIfSinglePage}" scrollerListener="#{testBean.doScroll}" maxPages="#{testBean.maxpage}"/>
</f:facet>
</h:dataTable>
+ <br />
+
+ <h:panelGrid columns="2" border="0">
+
+ <h:outputText value="render if single page" style="font-weight: bold;" />
+ <h:inputText value="#{testBean.renderIfSinglePage}"/>
+
+ <h:outputText value="Rows" style="font-weight: bold;" />
+ <h:inputText value="#{testBean.rows}"/>
+
+ <h:outputText value="Max page" style="font-weight: bold;" />
+ <h:inputText value="#{testBean.maxpage}"/>
+
+
+ </h:panelGrid>
+
+ <h:commandLink value="apply" />
+
+
+
</h:form>
</f:view>
</body>
18 years, 6 months
JBoss Rich Faces SVN: r107 - trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-21 04:15:58 -0400 (Wed, 21 Mar 2007)
New Revision: 107
Modified:
trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
Log:
RFA-320 fixed. Has added check of presence initialState in
stateOrder. If initialState not presence in stateOrder
then set first element from stateOrder.
Modified: trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java
===================================================================
--- trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-03-20 20:53:56 UTC (rev 106)
+++ trunk/richfaces/togglePanel/src/main/java/org/richfaces/renderkit/html/TogglePanelRenderer.java 2007-03-21 08:15:58 UTC (rev 107)
@@ -87,8 +87,13 @@
String state = (String) component.getValue();
if (state == null) {
String initialState = component.getInitialState();
- if(initialState != null) {
- state = initialState;
+ if(initialState != null) {
+ if (stateOrderList.contains(initialState)){
+ state = initialState;
+ }
+ else{
+ state = (String) stateOrderList.get(0);
+ }
}
else{
state = (String) stateOrderList.get(0);
18 years, 6 months
JBoss Rich Faces SVN: r106 - trunk/richfaces-samples/modalpanel-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-20 16:53:56 -0400 (Tue, 20 Mar 2007)
New Revision: 106
Modified:
trunk/richfaces-samples/modalpanel-sample/src/main/webapp/pages/index.jsp
Log:
"text-align: left" applied to body as test case to http://jira.jboss.com/jira/browse/RF-18
Modified: trunk/richfaces-samples/modalpanel-sample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/richfaces-samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-03-20 20:53:01 UTC (rev 105)
+++ trunk/richfaces-samples/modalpanel-sample/src/main/webapp/pages/index.jsp 2007-03-20 20:53:56 UTC (rev 106)
@@ -20,7 +20,7 @@
}
</style>
</head>
- <body>
+ <body style="text-align: center;">
<f:view>
<h:form id="_form">
18 years, 6 months
JBoss Rich Faces SVN: r105 - in trunk/richfaces/modal-panel/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-20 16:53:01 -0400 (Tue, 20 Mar 2007)
New Revision: 105
Modified:
trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
ContainerDiv positioning changed to "absolute" to ignore text-alignment style settings. Calculations updated.
Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-20 20:29:11 UTC (rev 104)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-20 20:53:01 UTC (rev 105)
@@ -342,19 +342,16 @@
if (this.div.style.position == "absolute")
{
- //IE workaround implemented here - sometimes IE uses client (0,0) as left top corner of window, sometimes (2,2)
- //this behaviour differs between 6-th and 7-th version in the same mode, so we add extra pixels to width & height
- //and then move DIV to left and top to prevent scroll bars as DIV is larger than client area
- var we = "getSizeElement().clientWidth + /**/ getSizeElement().clientLeft + /**/\"px\"";
- var he = "getSizeElement().clientHeight + /**/ getSizeElement().clientTop + /**/\"px\"";
+ var we = "getSizeElement().clientWidth + \"px\"";
+ var he = "getSizeElement().clientHeight + \"px\"";
this.div.style.setExpression("width", we);
this.div.style.setExpression("height", he);
this.cursorDiv.style.setExpression("width", we);
this.cursorDiv.style.setExpression("height", he);
- var le = "-Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft /* + getSizeElement().clientLeft - getSizeElement().clientLeft*/ + \"px\"";
- var te = "-Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop /* + getSizeElement().clientTop - getSizeElement().clientTop*/ + \"px\"";
+ var le = "-Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\"";
+ var te = "-Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\"";
this.div.style.setExpression("left", le);
this.div.style.setExpression("top", te);
@@ -363,8 +360,8 @@
this.cursorDiv.style.setExpression("top", te);
- var leftExpr = "(this.mpLeft || 0) + -Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + getSizeElement().clientLeft + \"px\"";
- var topExpr = "(this.mpTop || 0) + -Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + getSizeElement().clientTop + \"px\"";
+ var leftExpr = "(this.mpLeft || 0) + -Position.cumulativeOffset(this.parentNode)[0] + getSizeElement().scrollLeft + \"px\"";
+ var topExpr = "(this.mpTop || 0) + -Position.cumulativeOffset(this.parentNode)[1] + getSizeElement().scrollTop + \"px\"";
this.cdiv.style.setExpression("left", leftExpr);
this.cdiv.style.setExpression("top", topExpr);
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-20 20:29:11 UTC (rev 104)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-20 20:53:01 UTC (rev 105)
@@ -32,7 +32,7 @@
<f:call name="checkOptions" />
<div id="#{clientId}Container"
- style="position: relative; display: none; z-index: #{component.zindex};"
+ style="position: absolute; display: none; z-index: #{component.zindex};"
class="rich-modalpanel"
x:passThruWithExclusions="id,style,class"
>
18 years, 6 months
JBoss Rich Faces SVN: r104 - trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-20 16:29:11 -0400 (Tue, 20 Mar 2007)
New Revision: 104
Modified:
trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
Missed size setting for IFRAME - fixed
Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-20 19:45:08 UTC (rev 103)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-20 20:29:11 UTC (rev 104)
@@ -258,7 +258,7 @@
if (ModalPanel.disableSelects && !this.iframe) {
new Insertion.Top(this.cdiv,
"<iframe src=\"javascript:''\" frameborder=\"0\" scrolling=\"no\" id=\"" + this.markerId.id + "IFrame\"" +
- "style=\"position: absolute; width: 100%; height: 100%; background-color: white; overflow-y: hidden; z-index: 1;\">" +
+ "style=\"position: absolute; width: 1px; height: 1px; background-color: white; overflow-y: hidden; z-index: 1;\">" +
"</iframe>");
this.iframe = $(this.markerId.id + "IFrame");
@@ -283,6 +283,9 @@
options.width = this.minWidth;
}
+ if (this.iframe) {
+ this.iframe.style.width = options.width + 'px';
+ }
this.contentDiv.style.width = options.width + 'px';
}
@@ -291,6 +294,9 @@
options.height = this.minHeight;
}
+ if (this.iframe) {
+ this.iframe.style.height = options.height + 'px';
+ }
this.contentDiv.style.height = options.height + 'px';
}
@@ -517,7 +523,11 @@
}
Element.setStyle(this.cdiv, cssHash);
+
Element.setStyle(this.contentDiv, cssHashWH);
+ if (this.iframe) {
+ Element.setStyle(this.iframe, cssHashWH);
+ }
var w = this.context.width();
var h = this.context.height();
18 years, 6 months
JBoss Rich Faces SVN: r103 - trunk/richfaces/common/src/main/java/org/richfaces/event.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-20 15:45:08 -0400 (Tue, 20 Mar 2007)
New Revision: 103
Modified:
trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
Log:
http://jira.jboss.com/jira/browse/RF-26 fixed
Modified: trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java
===================================================================
--- trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-20 18:52:01 UTC (rev 102)
+++ trunk/richfaces/common/src/main/java/org/richfaces/event/SwitchablePanelSwitchEvent.java 2007-03-20 19:45:08 UTC (rev 103)
@@ -22,9 +22,8 @@
package org.richfaces.event;
import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.FacesListener;
/**
* @author Nick Belaevski - nbelaevski(a)exadel.com
@@ -55,7 +54,12 @@
}
public Object getSource() {
- return eventSource;
+ if (eventSource != null) {
+ return eventSource;
+ }
+
+ //fix for MyFaces - they use getSource() in queueEvent()
+ return super.getSource();
}
public Object getValue() {
18 years, 6 months
JBoss Rich Faces SVN: r102 - trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-20 14:52:01 -0400 (Tue, 20 Mar 2007)
New Revision: 102
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
Log:
http://jira.jboss.com/jira/browse/RF-22 Fixed.
onupdatedrag added to DnD.Draggable. The algorithm to check:
1. check first "mousemove" event if it provides button property (IE only)
2. abort drag on next mousemove event if left button is not pressed
Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
===================================================================
--- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-20 14:23:52 UTC (rev 101)
+++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-20 18:52:01 UTC (rev 102)
@@ -142,6 +142,26 @@
this.options.ondragend();
}
},
+
+ onupdatedrag: function(event) {
+ if ("mousemove" == event.type) {
+ if (!this.mouseMoveProvidesButtonChecked) {
+ this.mouseMoveProvidesButtonChecked = true;
+ if (!this.mouseMoveProvidesButton) {
+ this.mouseMoveProvidesButton = event.button != 0;
+ }
+ }
+
+ if (this.mouseMoveProvidesButton && !Event.isLeftClick(event)) {
+ DnD.endDrag(event);
+
+ return false;
+ }
+ }
+
+ return true;
+ },
+
/**
* cubclasses may define custom behavior
* @param {Object} drag
18 years, 6 months
JBoss Rich Faces SVN: r101 - in trunk/richfaces/datascroller/src/main/java/org/richfaces: renderkit/html and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-20 10:23:52 -0400 (Tue, 20 Mar 2007)
New Revision: 101
Modified:
trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
Log:
http://jira.jboss.com/jira/browse/RF-23 fixed
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-19 19:08:01 UTC (rev 100)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/component/UIDatascroller.java 2007-03-20 14:23:52 UTC (rev 101)
@@ -269,11 +269,11 @@
int rows = getRows();
int next = dataTable.getFirst() + rows;
if (next < getRowCount()) dataTable.setFirst(next);
- if (rows>0){
- if (((next+rows)/rows)>getMaxPages()){
- next=getMaxPages()*rows-rows;;
- }
- }
+ //if (rows>0){
+ // if (((next+rows)/rows)>getMaxPages()){
+ // next=getMaxPages()*rows-rows;;
+ // }
+ //}
}
else if (FAST_FORWARD_FACET_NAME.equals(facetName)) {
int fastStep = getFastStep();
@@ -283,11 +283,11 @@
int rowcount = getRowCount();
if (next >= rowcount)
next = (rowcount - 1) - ((rowcount - 1) % rows);
- if (rows>0){
- if (((next+rows)/rows)>getMaxPages()){
- next=getMaxPages()*rows-rows;;
- }
- }
+ //if (rows>0){
+ // if (((next+rows)/rows)>getMaxPages()){
+ // next=getMaxPages()*rows-rows;;
+ //}
+ //}
dataTable.setFirst(next);
}
else if (FAST_REWIND_FACET_NAME.equals(facetName)) {
@@ -304,11 +304,11 @@
int first = delta > 0 && delta < rows ? rowcount - delta : rowcount
- rows;
if (first >= 0) {
- if (rows>0){
- if (((first+rows)/rows)>getMaxPages()){
- first=getMaxPages()*rows-rows;
- }
- }
+ //if (rows>0){
+ //if (((first+rows)/rows)>getMaxPages()){
+ // first=getMaxPages()*rows-rows;
+ //}
+ //}
dataTable.setFirst(first);
}
else {
@@ -473,6 +473,9 @@
return getUIData().getFirst();
}
+ public void setFirstRow(int rows) {
+ getUIData().setFirst(rows);
+ }
Modified: trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java
===================================================================
--- trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-19 19:08:01 UTC (rev 100)
+++ trunk/richfaces/datascroller/src/main/java/org/richfaces/renderkit/html/DataScrollerRenderer.java 2007-03-20 14:23:52 UTC (rev 101)
@@ -41,7 +41,45 @@
return UIDatascroller.class;
}
+ public void encodeBegin(FacesContext context, UIComponent component)
+ throws IOException {
+
+ UIDatascroller scroller = (UIDatascroller) component;
+
+ //if ((scroller.getRowCount()-scroller.getFirstRow())<scroller.getRows() && scroller.getRowCount()>=scroller.getRows()){
+ // scroller.setFirstRow(scroller.getRowCount()-scroller.getRows()+1);
+ //}
+
+ if (scroller.getHandleValue()==null){
+ scroller.setHandleValue("1");
+ }
+
+ if (scroller.getPageCount() < Integer.parseInt(scroller.getHandleValue())){
+
+ scroller.setPageIndex(scroller.getPageCount()-1);
+ scroller.setHandleValue(Integer.toString(scroller.getPageCount()));
+ }
+ else{
+ scroller.setPageIndex(Integer.parseInt(scroller.getHandleValue())-1);
+ }
+
+
+
+ if (!(scroller.getPageCount()==1) || (scroller.isRenderIfSinglePage())){
+ super.encodeBegin(context, component);
+ }
+ }
+ public void encodeEnd(FacesContext context, UIComponent component)
+ throws IOException {
+ UIDatascroller scroller = (UIDatascroller) component;
+
+ if (!(scroller.getPageCount()==1) || (scroller.isRenderIfSinglePage())){
+ super.encodeEnd(context, component);
+ }
+ }
+
+
//public static final String RENDERER_TYPE = Datascroller.RENDERER_TYPE;
private static final String PARAM_SUFFIX = "_parameter";
@@ -90,7 +128,7 @@
int maxPages = scroller.getMaxPages();
if (maxPages <= 1) {
- maxPages = 2;
+ maxPages = 1;
}
int pageCount = scroller.getPageCount();
if (pageCount <= 1) {
18 years, 6 months
JBoss Rich Faces SVN: r100 - trunk/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dragSupport.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-03-19 15:08:01 -0400 (Mon, 19 Mar 2007)
New Revision: 100
Modified:
trunk/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml
Log:
http://jira.jboss.com/jira/browse/RF-21 Fix for demo applied (IE 6)
Modified: trunk/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml
===================================================================
--- trunk/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-03-19 17:55:25 UTC (rev 99)
+++ trunk/richfaces-samples/richfaces-demo/src/main/webapp/richfaces/dragSupport/usage.xhtml 2007-03-19 19:08:01 UTC (rev 100)
@@ -13,6 +13,10 @@
vertical-align:top;
height:300px;
}
+
+ .dropTargetPanel {
+ width: 90%;
+ }
</style>
<p>The Richfaces Drag-n-Drop component suite includes three components: dragSupport, dropSupport
@@ -75,7 +79,7 @@
</h:dataTable>
</rich:panel>
- <rich:panel>
+ <rich:panel styleClass="dropTargetPanel">
<f:facet name="header">
<h:outputText value="PHP Frameworks" />
</f:facet>
@@ -92,7 +96,7 @@
</rich:panel>
- <rich:panel>
+ <rich:panel styleClass="dropTargetPanel">
<f:facet name="header">
<h:outputText value=".NET Frameworks" />
</f:facet>
@@ -109,7 +113,7 @@
</rich:panel>
- <rich:panel>
+ <rich:panel styleClass="dropTargetPanel">
<f:facet name="header">
<h:outputText value="ColdFusion Frameworks" />
</f:facet>
18 years, 6 months