JBoss Rich Faces SVN: r4674 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-10 15:18:21 -0500 (Mon, 10 Dec 2007)
New Revision: 4674
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
Log:
headers rendering was changed
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-10 20:17:48 UTC (rev 4673)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-10 20:18:21 UTC (rev 4674)
@@ -40,7 +40,7 @@
}
} else {
if (this.headerTable && this.headerTable.tHead) {
- this.headerTable.style.width = this.contentDiv.offsetWidth;
+ this.headerTable.style.width = "100%";
}
}
}
16 years, 10 months
JBoss Rich Faces SVN: r4673 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-10 15:17:48 -0500 (Mon, 10 Dec 2007)
New Revision: 4673
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
Log:
headers rendering was changed
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-10 19:47:20 UTC (rev 4672)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/LayoutManager.js 2007-12-10 20:17:48 UTC (rev 4673)
@@ -41,7 +41,7 @@
} else {
if (this.headerTable && this.headerTable.tHead) {
this.headerTable.style.width = this.contentDiv.offsetWidth;
- }
+ }
}
}
16 years, 10 months
JBoss Rich Faces SVN: r4672 - branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-10 14:47:20 -0500 (Mon, 10 Dec 2007)
New Revision: 4672
Modified:
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
Log:
bug: RF-1546
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-10 19:46:33 UTC (rev 4671)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2007-12-10 19:47:20 UTC (rev 4672)
@@ -56,8 +56,8 @@
this.shuttle = null;
this.sortOrder = Richfaces.ListBase.ASC;
-
- this.shuttleTable.observe("click", function(e) {this.onclickHandler(window.event || e)}.bindAsEventListener(this));
+ this.clckHandler = function(e) {this.onclickHandler(window.event || e)}.bindAsEventListener(this);
+ this.shuttleTable.observe("click", this.clckHandler);
},
retrieveShuttleItems : function(containerId, controlClass) {
@@ -121,7 +121,6 @@
return; //for IE
}
}
-
return activeElem;
},
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-10 19:46:33 UTC (rev 4671)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/OrderingList.js 2007-12-10 19:47:20 UTC (rev 4672)
@@ -28,9 +28,7 @@
if (onorderchanged) {
this.container.observe("rich:onorderchanged", onorderchanged);
}
-
this.controlList = new Array();
-
this.initControlList(containerId, ids);
},
16 years, 10 months
JBoss Rich Faces SVN: r4671 - branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-10 14:46:33 -0500 (Mon, 10 Dec 2007)
New Revision: 4671
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
Log:
bug: RF-1546
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-10 18:52:28 UTC (rev 4670)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/scripts/ListShuttle.js 2007-12-10 19:46:33 UTC (rev 4671)
@@ -47,11 +47,6 @@
Richfaces.ListShuttle.prototype = {
initialize: function(targetList, sourceList, clientId, controlIds, switchByClick, sourceLayoutManager, targetLayoutManager) {
- sourceList._onclickHandler = sourceList.onclickHandler;
- sourceList.onclickHandler = function(e) { this.onclickHandler(e, sourceList); }.bindAsEventListener(this);
- targetList._onclickHandler = targetList.onclickHandler;
- targetList.onclickHandler = function(e) { this.onclickHandler(e, targetList); }.bindAsEventListener(this);
-
this.targetList = targetList;
this.sourceList = sourceList;
@@ -64,6 +59,13 @@
if (switchByClick == "true") {
this.targetList.shuttleTable.observe("click", function(e) {this.moveItemByClick(window.event||e, this.targetList, this.sourceList)}.bindAsEventListener(this));
this.sourceList.shuttleTable.observe("click", function(e) {this.moveItemByClick(window.event||e, this.sourceList, this.targetList)}.bindAsEventListener(this));
+ Event.stopObserving(this.sourceList.shuttleTable, "click", this.sourceList.clckHandler);
+ Event.stopObserving(this.targetList.shuttleTable, "click", this.targetList.clckHandler);
+ } else {
+ sourceList._onclickHandler = sourceList.onclickHandler;
+ sourceList.onclickHandler = function(e) { this.onclickHandler(e, sourceList); }.bindAsEventListener(this);
+ targetList._onclickHandler = targetList.onclickHandler;
+ targetList.onclickHandler = function(e) { this.onclickHandler(e, targetList); }.bindAsEventListener(this);
}
this.controlList = new Array();
@@ -138,8 +140,8 @@
if (!(item instanceof Richfaces.SelectItem)) {
item = sourceComponent.getSelectItemByNode(item);
}
+ this.removeItem(sourceComponent, item);
this.addItem(targetComponent, item);
- this.removeItem(sourceComponent, item);
},
removeItem : function(component, item) {
16 years, 10 months
JBoss Rich Faces SVN: r4670 - in branches/3.1.x: ui/calendar/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-10 13:52:28 -0500 (Mon, 10 Dec 2007)
New Revision: 4670
Modified:
branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
http://jira.jboss.com/jira/browse/RF-1573
Modified: branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-10 18:48:52 UTC (rev 4669)
+++ branches/3.1.x/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2007-12-10 18:52:28 UTC (rev 4670)
@@ -28,6 +28,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
@@ -84,7 +85,7 @@
Set ajaxAreasToRender = new HashSet();
- Set ajaxRenderedAreas = new HashSet();
+ Set ajaxRenderedAreas = new LinkedHashSet();
boolean ajaxRequest = false;
@@ -119,7 +120,7 @@
ajaxAreasToRender = new HashSet();
- ajaxRenderedAreas = new HashSet();
+ ajaxRenderedAreas = new LinkedHashSet();
ajaxRequest = false;
Modified: branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-12-10 18:48:52 UTC (rev 4669)
+++ branches/3.1.x/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2007-12-10 18:52:28 UTC (rev 4670)
@@ -33,6 +33,7 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -87,9 +88,10 @@
UICalendar component) {
AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
- if (ajaxContext.isAjaxRequest()) {
- String clientId = component.getClientId(context);
-
+ Set ajaxRenderedAreas = ajaxContext.getAjaxRenderedAreas();
+ String clientId = component.getClientId(context);
+
+ if (ajaxContext.isAjaxRequest() && ajaxRenderedAreas.contains(clientId)) {
ajaxContext.getAjaxRenderedAreas().add(
clientId + "Popup");
16 years, 10 months
JBoss Rich Faces SVN: r4669 - branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-10 13:48:52 -0500 (Mon, 10 Dec 2007)
New Revision: 4669
Modified:
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
Log:
http://jira.jboss.com/jira/browse/RF-1178
Modified: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java 2007-12-10 17:37:02 UTC (rev 4668)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/component/ListShuttleComponentTest.java 2007-12-10 18:48:52 UTC (rev 4669)
@@ -23,15 +23,21 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import javax.faces.application.FacesMessage;
import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
import javax.faces.component.UIForm;
import javax.faces.component.html.HtmlCommandLink;
import javax.faces.component.html.HtmlForm;
import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.ValueBinding;
+import javax.faces.validator.Validator;
+import javax.faces.validator.ValidatorException;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
@@ -44,6 +50,7 @@
public class ListShuttleComponentTest extends AbstractAjax4JsfTestCase {
private UIForm form = null;
private UIListShuttle listShuttle = null;
+ private UIListShuttle listShuttle2 = null;
private ListShuttleBean sourceBean = null;
private ListShuttleBean targetBean = null;
private UICommand command = null;
@@ -128,11 +135,14 @@
});
form.getChildren().add(listShuttle);
+
+ listShuttle2 = (UIListShuttle)application.createComponent(UIListShuttle.COMPONENT_TYPE);
}
public void tearDown() throws Exception {
form = null;
listShuttle = null;
+ listShuttle2 = null;
sourceBean = null;
targetBean = null;
command = null;
@@ -153,15 +163,113 @@
HtmlAnchor anchor = (HtmlAnchor)view.getDocumentElement().getHtmlElementById(command.getClientId(facesContext));
anchor.click();
- externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "1sa,0");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
listShuttle.processDecodes(facesContext);
Object submittedValue = listShuttle.getSubmittedValue();
assertNotNull(submittedValue);
- assertTrue(submittedValue instanceof Object[]);
- assertEquals(2, ((Object[])submittedValue).length);
+ assertTrue(submittedValue instanceof UIListShuttle.SubmittedValue);
+ assertFalse(((UIListShuttle.SubmittedValue)submittedValue).isNull());
}
+ public void testDecodeImmediate() throws Exception {
+ listShuttle.setImmediate(true);
+ listShuttle.addValidator(new Validator() {
+
+ public void validate(FacesContext arg0, UIComponent arg1,
+ Object arg2) throws ValidatorException {
+ FacesMessage mess = new FacesMessage("Fake test message.");
+ throw new ValidatorException(mess);
+
+ }
+ });
+
+ HtmlPage view = renderView();
+ HtmlAnchor anchor = (HtmlAnchor)view.getDocumentElement().getHtmlElementById(command.getClientId(facesContext));
+ anchor.click();
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
+ listShuttle.processDecodes(facesContext);
+ assertTrue(facesContext.getMessages().hasNext());
+ }
+
+ /**
+ * Tests if component handles value bindings correctly
+ *
+ * @throws Exception
+ */
+ public void testUpdate() throws Exception {
+ HtmlPage page = renderView();
+ assertNotNull(page);
+
+ HtmlAnchor anchor = (HtmlAnchor)page.getDocumentElement().getHtmlElementById(command.getClientId(facesContext));
+ anchor.click();
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
+ listShuttle.processDecodes(facesContext);
+ listShuttle.processValidators(facesContext);
+ listShuttle.processUpdates(facesContext);
+
+ assertNotNull(targetBean.getValue());
+ assertEquals(1, targetBean.getValue().size());
+ assertEquals("1", targetBean.getValue().get(0));
+ }
+
+ /**
+ * Tests if component handles validation correctly
+ *
+ * @throws Exception
+ */
+ public void testValidate() throws Exception {
+ listShuttle.addValidator(new Validator() {
+
+ public void validate(FacesContext arg0, UIComponent arg1,
+ Object arg2) throws ValidatorException {
+ FacesMessage mess = new FacesMessage("Fake test message.");
+ throw new ValidatorException(mess);
+
+ }
+
+ });
+
+ HtmlPage page = renderView();
+ assertNotNull(page);
+
+ HtmlAnchor anchor = (HtmlAnchor)page.getDocumentElement().getHtmlElementById(command.getClientId(facesContext));
+ anchor.click();
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "sa1:2");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), ":");
+ externalContext.addRequestParameterMap(listShuttle.getClientId(facesContext), "0:1");
+ listShuttle.processDecodes(facesContext);
+ listShuttle.processValidators(facesContext);
+ assertTrue(facesContext.getMessages().hasNext());
+
+ Object submittedValue = listShuttle.getSubmittedValue();
+ assertNotNull(submittedValue);
+ assertTrue(submittedValue instanceof UIListShuttle.SubmittedValue);
+ assertFalse(((UIListShuttle.SubmittedValue)submittedValue).isNull());
+ }
+
+ public void testSaveRestore() throws Exception {
+ List value = new ArrayList();
+ value.add("1");
+ listShuttle.setValueBinding("sourceValue", null);
+ listShuttle.setSourceValue(value);
+ assertEquals(value, listShuttle.getSourceValue());
+ assertNull(listShuttle.getValueBinding("value"));
+
+ Object state = listShuttle.saveState(facesContext);
+
+ listShuttle2.restoreState(facesContext, state);
+ Object value2 = listShuttle2.getSourceValue();
+ assertNotNull(value2);
+ assertEquals(value, value2);
+ }
+
protected class ListShuttleBean {
private List value = null;
16 years, 10 months
JBoss Rich Faces SVN: r4668 - branches/3.1.x/ui/orderingList/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2007-12-10 12:37:02 -0500 (Mon, 10 Dec 2007)
New Revision: 4668
Modified:
branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml
Log:
bug: RF-1517
Modified: branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-12-10 17:17:04 UTC (rev 4667)
+++ branches/3.1.x/ui/orderingList/src/main/config/component/orderinglist.xml 2007-12-10 17:37:02 UTC (rev 4668)
@@ -68,6 +68,7 @@
<description>
listWidth
</description>
+ <defaultvalue>"140"</defaultvalue>
</property>
<property>
<name>listHeight</name>
@@ -75,6 +76,7 @@
<description>
listHeight
</description>
+ <defaultvalue>"140"</defaultvalue>
</property>
<property>
<name>rowClasses</name>
16 years, 10 months
JBoss Rich Faces SVN: r4667 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-12-10 12:17:04 -0500 (Mon, 10 Dec 2007)
New Revision: 4667
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1572
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-10 17:15:54 UTC (rev 4666)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-10 17:17:04 UTC (rev 4667)
@@ -694,8 +694,8 @@
{
var element = $(this.id);
var htmlBegin = '<div id="'+this.TIME_EDITOR_SHADOW_ID+'" class="rich-calendar-time-shadow" style="position:absolute; display:none;"></div><table border="0" cellpadding="0" cellspacing="0" id="'+this.TIME_EDITOR_ID+'" style="position:absolute; display:none;"><tbody><tr><td class="rich-calendar-time-layout-container" align="center"><div style="position:relative; width:100%">';
- var htmlEndn = '</div></td></tr></tbody></table>';
- new Insertion.After(element, htmlBegin+this.evaluateMarkup(CalendarView.timeEditor, this.calendarContext));
+ var htmlEnd = '</div></td></tr></tbody></table>';
+ new Insertion.After(element, htmlBegin+this.evaluateMarkup(CalendarView.timeEditor, this.calendarContext)+htmlEnd);
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
var te = $(this.TIME_EDITOR_ID);
te.style.zIndex = te_shadow.style.zIndex = element.getStyle('z-index');
@@ -727,15 +727,15 @@
'<table border="0" cellspacing="0" cellpadding="0"><tbody>'+
'<tr><td>'+
'<div id="'+id+'BtnUp" class="rich-calendar-spinner-up"'+
- 'onmousedown="this.className=\'rich-calendar-spinner-up rich-calendar-spinner-pressed\'" '+
- 'onmouseup="this.className=\'rich-calendar-spinner-up\'"'+
- 'onmouseout="this.className=\'rich-calendar-spinner-up\'" />'+
+ ' onmousedown="this.className=\'rich-calendar-spinner-up rich-calendar-spinner-pressed\'"'+
+ ' onmouseup="this.className=\'rich-calendar-spinner-up\'"'+
+ ' onmouseout="this.className=\'rich-calendar-spinner-up\'"/>'+
'</td></tr>'+
'<tr><td>'+
'<div id="'+id+'BtnDown" class="rich-calendar-spinner-down"'+
- 'onmousedown="this.className=\'rich-calendar-spinner-down rich-calendar-spinner-pressed\'" '+
- 'onmouseup="this.className=\'rich-calendar-spinner-down\'"'+
- 'onmouseout="this.className=\'rich-calendar-spinner-down\'" />'+
+ ' onmousedown="this.className=\'rich-calendar-spinner-down rich-calendar-spinner-pressed\'"'+
+ ' onmouseup="this.className=\'rich-calendar-spinner-down\'"'+
+ ' onmouseout="this.className=\'rich-calendar-spinner-down\'" />'+
'</td></tr>'+
'</tbody></table>'+
'</td>'+
@@ -1768,14 +1768,14 @@
var te = $(this.TIME_EDITOR_ID);
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
- /*var dim = Richfaces.Calendar.getOffsetDimensions(element);
+ var dim = Richfaces.Calendar.getOffsetDimensions(element);
te.style.width = te_shadow.style.width = dim.width + 'px';
te.style.height = te_shadow.style.height = dim.height + 'px';
te.style.left = te_shadow.style.left = element.style.left;
- te.style.top = te_shadow.style.top = element.style.top;*/
+ te.style.top = te_shadow.style.top = element.style.top;
- Element.clonePosition(te, element);
- Element.clonePosition(te_shadow, element);
+ //Element.clonePosition(te, element);
+ //Element.clonePosition(te_shadow, element);
this.updateTimeEditor();
16 years, 10 months
JBoss Rich Faces SVN: r4666 - branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-12-10 12:15:54 -0500 (Mon, 10 Dec 2007)
New Revision: 4666
Modified:
branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1572
Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-10 16:45:34 UTC (rev 4665)
+++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-10 17:15:54 UTC (rev 4666)
@@ -694,8 +694,8 @@
{
var element = $(this.id);
var htmlBegin = '<div id="'+this.TIME_EDITOR_SHADOW_ID+'" class="rich-calendar-time-shadow" style="position:absolute; display:none;"></div><table border="0" cellpadding="0" cellspacing="0" id="'+this.TIME_EDITOR_ID+'" style="position:absolute; display:none;"><tbody><tr><td class="rich-calendar-time-layout-container" align="center"><div style="position:relative; width:100%">';
- var htmlEndn = '</div></td></tr></tbody></table>';
- new Insertion.After(element, htmlBegin+this.evaluateMarkup(CalendarView.timeEditor, this.calendarContext));
+ var htmlEnd = '</div></td></tr></tbody></table>';
+ new Insertion.After(element, htmlBegin+this.evaluateMarkup(CalendarView.timeEditor, this.calendarContext)+htmlEnd);
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
var te = $(this.TIME_EDITOR_ID);
te.style.zIndex = te_shadow.style.zIndex = element.getStyle('z-index');
@@ -727,15 +727,15 @@
'<table border="0" cellspacing="0" cellpadding="0"><tbody>'+
'<tr><td>'+
'<div id="'+id+'BtnUp" class="rich-calendar-spinner-up"'+
- 'onmousedown="this.className=\'rich-calendar-spinner-up rich-calendar-spinner-pressed\'" '+
- 'onmouseup="this.className=\'rich-calendar-spinner-up\'"'+
- 'onmouseout="this.className=\'rich-calendar-spinner-up\'" />'+
+ ' onmousedown="this.className=\'rich-calendar-spinner-up rich-calendar-spinner-pressed\'"'+
+ ' onmouseup="this.className=\'rich-calendar-spinner-up\'"'+
+ ' onmouseout="this.className=\'rich-calendar-spinner-up\'"/>'+
'</td></tr>'+
'<tr><td>'+
'<div id="'+id+'BtnDown" class="rich-calendar-spinner-down"'+
- 'onmousedown="this.className=\'rich-calendar-spinner-down rich-calendar-spinner-pressed\'" '+
- 'onmouseup="this.className=\'rich-calendar-spinner-down\'"'+
- 'onmouseout="this.className=\'rich-calendar-spinner-down\'" />'+
+ ' onmousedown="this.className=\'rich-calendar-spinner-down rich-calendar-spinner-pressed\'"'+
+ ' onmouseup="this.className=\'rich-calendar-spinner-down\'"'+
+ ' onmouseout="this.className=\'rich-calendar-spinner-down\'" />'+
'</td></tr>'+
'</tbody></table>'+
'</td>'+
@@ -1768,14 +1768,14 @@
var te = $(this.TIME_EDITOR_ID);
var te_shadow = $(this.TIME_EDITOR_SHADOW_ID);
- /*var dim = Richfaces.Calendar.getOffsetDimensions(element);
+ var dim = Richfaces.Calendar.getOffsetDimensions(element);
te.style.width = te_shadow.style.width = dim.width + 'px';
te.style.height = te_shadow.style.height = dim.height + 'px';
te.style.left = te_shadow.style.left = element.style.left;
- te.style.top = te_shadow.style.top = element.style.top;*/
+ te.style.top = te_shadow.style.top = element.style.top;
- Element.clonePosition(te, element);
- Element.clonePosition(te_shadow, element);
+ //Element.clonePosition(te, element);
+ //Element.clonePosition(te_shadow, element);
this.updateTimeEditor();
16 years, 10 months
JBoss Rich Faces SVN: r4665 - trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2007-12-10 11:45:34 -0500 (Mon, 10 Dec 2007)
New Revision: 4665
Modified:
trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
Log:
RF-1201 refactoring
Modified: trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java
===================================================================
--- trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-10 16:25:41 UTC (rev 4664)
+++ trunk/sandbox/ui/columns/src/main/java/org/richfaces/taglib/html/facelets/ColumnsHandler.java 2007-12-10 16:45:34 UTC (rev 4665)
@@ -30,7 +30,6 @@
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentHandler;
-
/**
* TODO Class description goes here.
*
@@ -50,7 +49,7 @@
/** index attribute */
private TagAttribute index;
-
+
/** rendered attribute */
private TagAttribute rendered;
@@ -88,9 +87,7 @@
*/
public ColumnsHandler(ComponentConfig config) {
super(config);
- this.value = getAttribute("value");
- this.var = getAttribute("var");
- this.index = getAttribute("index");
+
}
/**
@@ -112,6 +109,8 @@
initVariables(ctx);
try {
+
+ this.value = getAttribute("value");
// produce the right sort of ForEachIterator
if (value != null) {
@@ -125,7 +124,7 @@
.supportedTypeForEachIterator(rawItems);
} else {
// no 'items', so use 'begin' and 'end'
- items = SimpleForEachIterator.beginEndForEachIterator(_end);
+ items = SimpleForEachIterator.beginEndForEachIterator(_end - 1);
}
} catch (Exception e) {
// TODO: handle exception
@@ -173,9 +172,10 @@
* Extracts integer value from end attr
*/
private void initEnd(FaceletContext ctx) {
+ this.end = getAttribute("end");
if (end != null) {
try {
- _end = (Integer) end.getObject(ctx);
+ _end = Integer.parseInt((String)end.getObject(ctx));
if (_end < 0) {
_end = 0; // If end is negative set up zero
}
@@ -191,6 +191,7 @@
* Extracts string value from var attr
*/
private void initVar(FaceletContext ctx) {
+ this.var = getAttribute("var");
if (var != null) {
try {
_itemId = (String) var.getObject(ctx);
@@ -205,6 +206,7 @@
* Extracts string value from index attr
*/
private void initIndex(FaceletContext ctx) {
+ this.index = getAttribute("index");
if (index != null) {
try {
_indexId = (String) index.getObject(ctx);
@@ -264,15 +266,16 @@
*/
private void exposeVariables(FaceletContext ctx, int k) {
-
VariableMapper vm = ctx.getVariableMapper();
if (_itemId != null) {
if (vm != null) {
- ValueExpression srcVE = value.getValueExpression(ctx,
- Object.class);
- ValueExpression ve = getVarExpression(ctx, srcVE, k);
- vm.setVariable(_itemId, ve);
+ if (value != null) {
+ ValueExpression srcVE = value.getValueExpression(ctx,
+ Object.class);
+ ValueExpression ve = getVarExpression(ctx, srcVE, k);
+ vm.setVariable(_itemId, ve);
+ }
}
}
@@ -347,20 +350,18 @@
// remove created component if columns count is zero
if (atFirst()) {
c.setRendered(false);
- }
+ }
if (vCounter == _index || atFirst()) {
release();
return;
}
-
+
exposeVariables(ctx, vCounter);
vCounter++;
-
}
-
/**
* Sets attribute to column
*
@@ -594,8 +595,8 @@
*
*/
public IndexedValueExpression(ValueExpression orig, int i) {
- this.i = new Integer(i);
- this.orig = orig;
+ this.i = new Integer(i);
+ this.orig = orig;
}
/*
@@ -604,12 +605,12 @@
* @see javax.el.ValueExpression#getValue(javax.el.ELContext)
*/
public Object getValue(ELContext context) {
- Object base = this.orig.getValue(context);
- if (base != null) {
- context.setPropertyResolved(false);
- return context.getELResolver().getValue(context, base, i);
- }
- return null;
+ Object base = this.orig.getValue(context);
+ if (base != null) {
+ context.setPropertyResolved(false);
+ return context.getELResolver().getValue(context, base, i);
+ }
+ return null;
}
/*
@@ -619,11 +620,11 @@
* java.lang.Object)
*/
public void setValue(ELContext context, Object value) {
- Object base = this.orig.getValue(context);
- if (base != null) {
- context.setPropertyResolved(false);
- context.getELResolver().setValue(context, base, i, value);
- }
+ Object base = this.orig.getValue(context);
+ if (base != null) {
+ context.setPropertyResolved(false);
+ context.getELResolver().setValue(context, base, i, value);
+ }
}
/*
@@ -632,12 +633,12 @@
* @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
*/
public boolean isReadOnly(ELContext context) {
- Object base = this.orig.getValue(context);
- if (base != null) {
- context.setPropertyResolved(false);
- return context.getELResolver().isReadOnly(context, base, i);
- }
- return true;
+ Object base = this.orig.getValue(context);
+ if (base != null) {
+ context.setPropertyResolved(false);
+ return context.getELResolver().isReadOnly(context, base, i);
+ }
+ return true;
}
/*
@@ -646,12 +647,12 @@
* @see javax.el.ValueExpression#getType(javax.el.ELContext)
*/
public Class getType(ELContext context) {
- Object base = this.orig.getValue(context);
- if (base != null) {
- context.setPropertyResolved(false);
- return context.getELResolver().getType(context, base, i);
- }
- return null;
+ Object base = this.orig.getValue(context);
+ if (base != null) {
+ context.setPropertyResolved(false);
+ return context.getELResolver().getType(context, base, i);
+ }
+ return null;
}
/*
@@ -660,7 +661,7 @@
* @see javax.el.ValueExpression#getExpectedType()
*/
public Class getExpectedType() {
- return Object.class;
+ return Object.class;
}
/*
@@ -669,7 +670,7 @@
* @see javax.el.Expression#getExpressionString()
*/
public String getExpressionString() {
- return this.orig.getExpressionString();
+ return this.orig.getExpressionString();
}
/*
@@ -678,7 +679,7 @@
* @see javax.el.Expression#equals(java.lang.Object)
*/
public boolean equals(Object obj) {
- return this.orig.equals(obj);
+ return this.orig.equals(obj);
}
/*
@@ -687,7 +688,7 @@
* @see javax.el.Expression#hashCode()
*/
public int hashCode() {
- return this.orig.hashCode();
+ return this.orig.hashCode();
}
/*
@@ -696,7 +697,7 @@
* @see javax.el.Expression#isLiteralText()
*/
public boolean isLiteralText() {
- return false;
+ return false;
}
}
16 years, 10 months