JBoss Rich Faces SVN: r4734 - in branches/3.1.x/ui: dataTable/src/test/java/org/richfaces/component and 9 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2007-12-11 13:37:35 -0500 (Tue, 11 Dec 2007)
New Revision: 4734
Modified:
branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java
branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
Unit tests fixed
Modified: branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java
===================================================================
--- branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/componentControl/src/test/java/org/richfaces/component/ComponentControlTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -110,13 +110,14 @@
assertNotNull(eventString);
assertTrue(eventString.contains("Richfaces.componentControl.performOperation"));
String [] params = eventString.split(",");
- assertEquals(5, params.length);
+ assertEquals(6, params.length);
assertTrue(params[0].trim().endsWith("event"));
assertEquals("'#button'", params[1].trim());
assertEquals("'testOperation'", params[2].trim());
assertTrue(params[3].trim().startsWith("{"));
- assertTrue(params[4].trim().endsWith("});"));
+ assertTrue(params[4].trim().endsWith("}"));
+ assertTrue(params[5].trim().endsWith("false)"));
assertTrue( true );
}
Modified: branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java
===================================================================
--- branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/dataTable/src/test/java/org/richfaces/component/DataTableComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -313,7 +313,7 @@
classAttr = tr.getAttributeValue("class");
assertTrue(classAttr.contains("dr-table-header rich-table-header"));
- List tds = tr.getHtmlElementsByTagName("td");
+ List tds = tr.getHtmlElementsByTagName("th");
assertTrue(tds.size() > 0);
HtmlElement td = (HtmlElement) tds.get(0);
assertNotNull(td);
Modified: branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java
===================================================================
--- branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/drag-drop/src/test/java/org/richfaces/component/DragDropTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -13,9 +13,6 @@
import javax.faces.event.PhaseId;
import org.ajax4jsf.event.EventsQueue;
-import org.ajax4jsf.resource.InternetResource;
-import org.ajax4jsf.resource.InternetResourceBuilder;
-import org.ajax4jsf.resource.ResourceBuilderImpl;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
import org.apache.commons.lang.StringUtils;
@@ -73,8 +70,7 @@
super(testName);
}
- public void SetUp() throws Exception {
-
+ public void setUp() throws Exception {
super.setUp();
form = new HtmlForm();
@@ -115,9 +111,8 @@
form.getChildren().add(dropsupport);
form.getChildren().add(panel2);
-
}
-
+
public void tearDown() throws Exception {
super.tearDown();
@@ -132,7 +127,6 @@
* Rigourous Test :-)
*/
public void testComponent() throws Exception {
- SetUp();
HtmlPage page = renderView();
assertNotNull(page);
@@ -157,7 +151,6 @@
}
public void testScript() throws Exception {
- SetUp();
HtmlPage page = renderView();
assertNotNull(page);
List scripts = page.getDocumentElement().getHtmlElementsByTagName(
Modified: branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-12-11 18:37:35 UTC (rev 4734)
@@ -17,47 +17,55 @@
if (!menu.isDisabled()) {]]>
</jsp:scriptlet>
- <div id="#{clientId}" style=""
- class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
- onmouseover="#{component.attributes['onmouseover']}"
- onmouseout="#{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
+ <div id="#{clientId}" style="#{component.attributes['style']}"
+ class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
<![CDATA[ } else { ]]>
</jsp:scriptlet>
- <div id="#{clientId}" style=""
- class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
- onmouseover="#{component.attributes['onmouseover']}"
- onmouseout="#{component.attributes['onmouseout']}"
- onmousemove="#{component.attributes['onmousemove']}">
+ <div id="#{clientId}" style="#{component.attributes['style']}"
+ class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']}"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmousemove="#{component.attributes['onmousemove']}">
<jsp:scriptlet>
- <![CDATA[ } if (menu.isDisabled() &&
- (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
- name="labelDisabled" /> </span> <jsp:scriptlet>
+ <![CDATA[ }
+
+ if (menu.isDisabled() && (component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="labelDisabled" />
+ </span>
+ <jsp:scriptlet>
<![CDATA[} else if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
- name="label" /> </span> <jsp:scriptlet>
- <![CDATA[} else {]]>
- </jsp:scriptlet> <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">
+ <u:insertFacet name="label" />
+ </span>
<jsp:scriptlet>
- <![CDATA[}]]>
- </jsp:scriptlet>
+ <![CDATA[} else {]]>
+ </jsp:scriptlet>
+ <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>
+ <jsp:scriptlet>
+ <![CDATA[}]]>
+ </jsp:scriptlet>
- <div
- style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
- <vcp:body>
- <f:call name="renderChildren" />
- </vcp:body></div>
+ <div style="margin: 0px; padding: 0px; border: 0px; position: relative; z-index: 100;">
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+ </div>
<jsp:scriptlet>
<![CDATA[if (!((org.richfaces.component.UIDropDownMenu) component).isDisabled()) {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[} else {]]>
</jsp:scriptlet>
- </div>
+ </div>
<jsp:scriptlet>
<![CDATA[}]]>
</jsp:scriptlet>
Modified: branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java
===================================================================
--- branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/jQuery/src/test/java/org/richfaces/component/JQueryComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -22,8 +22,6 @@
package org.richfaces.component;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Set;
import javax.faces.component.UIComponent;
@@ -31,11 +29,8 @@
import javax.faces.component.html.HtmlForm;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
-import org.apache.commons.lang.StringUtils;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlScript;
/**
* Unit test for simple Component.
@@ -76,12 +71,8 @@
form = null;
}
- public void testRendcerComponent() throws Exception {
+ public void testRenderComponent() throws Exception {
HtmlPage renderedView = renderView();
-
- HtmlElement htmlGmap = renderedView.getHtmlElementById(jq.getClientId(facesContext));
-
-
}
public void testRenderStyle() throws Exception {
Modified: branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java
===================================================================
--- branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -33,13 +33,13 @@
import javax.faces.event.PhaseId;
import javax.servlet.http.HttpServletResponse;
+import org.ajax4jsf.event.EventsQueue;
import org.ajax4jsf.resource.InternetResource;
import org.ajax4jsf.resource.InternetResourceBuilder;
import org.ajax4jsf.resource.ResourceBuilderImpl;
import org.ajax4jsf.resource.image.ImageInfo;
import org.ajax4jsf.tests.AbstractAjax4JsfTestCase;
import org.ajax4jsf.tests.MockViewRoot;
-import org.ajax4jsf.event.EventsQueue;
import org.apache.commons.lang.StringUtils;
import org.richfaces.component.html.HtmlMenuItem;
import org.richfaces.renderkit.html.images.background.MenuItemBackground;
@@ -225,8 +225,6 @@
classAttr = div.getAttributeValue("onclick");
assertNotNull(classAttr);
assertTrue(classAttr.length() > 0);
- classAttr = div.getAttributeValue("onmouseover");
- assertTrue(classAttr.contains("menuItemSelectStyle"));
}
/**
Modified: branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -4,12 +4,9 @@
package org.richfaces.renderkit.html;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Iterator;
-import java.util.List;
import javax.faces.application.FacesMessage;
-import javax.faces.application.FacesMessage.Severity;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessages;
import javax.faces.context.FacesContext;
Modified: branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java
===================================================================
--- branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/message/src/test/java/org/richfaces/renderer/RichMessagesRendererTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -46,6 +46,9 @@
List links = page.getDocumentElement().getHtmlElementsByTagName("link");
assertNotNull(links);
HtmlElement link = (HtmlElement)links.get(0);
+ assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/msg.css"));
+
+ link = (HtmlElement)links.get(1);
assertTrue(link.getAttributeValue("href").contains("org/richfaces/renderkit/html/css/msgs.css"));
}
@@ -197,25 +200,22 @@
assertTrue(classAttr.contains("errorClass")||classAttr.contains("fatalClass")
||classAttr.contains("warnClass") ||classAttr.contains("infoClass"));
- Iterator spanIter= dt.getChildElementsIterator();
+ Iterator spanIter = dt.getChildElementsIterator();
for (; spanIter.hasNext();) {
- HtmlElement span = (HtmlElement) dtIter.next();
+ HtmlElement span = (HtmlElement) spanIter.next();
assertNotNull(span);
- assertEquals(dt.getNodeName().toLowerCase(), "span");
+ assertEquals(span.getNodeName().toLowerCase(), "span");
- classAttr = dt.getAttributeValue("class");
+ classAttr = span.getAttributeValue("class");
- assertTrue(classAttr.contains("rich-messages-label") || classAttr.contains("rich-massages-marker"));
+ assertTrue(classAttr.contains("rich-messages-label") || classAttr.contains("rich-messages-marker"));
assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")
|| classAttr.contains("fatalLabelClass") || classAttr.contains("warnLabelClass")
|| classAttr.contains("errorMarkerClass") || classAttr.contains("fatalMarkerClass")
|| classAttr.contains("infoMarkerClass") || classAttr.contains("warnMarkerClass"));
- String title = dt.getAttributeValue("title");
-
- assertEquals("TITLTE", title);
}
}
@@ -264,8 +264,6 @@
assertTrue(classAttr.contains("errorLabelClass") || classAttr.contains("infoLabelClass")
|| classAttr.contains("fatalLabelClass") || classAttr.contains("warnLabelClass"));
- String title = elem.getAttributeValue("title");
- assertEquals("TITLTE", title);
}
}
}
Modified: branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java
===================================================================
--- branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/panelbar/src/test/java/org/richfaces/component/PanelBarComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -271,12 +271,12 @@
*/
public void testPanelBarDoDecodeNoEvent() throws Exception {
- externalContext.getRequestParameterMap().put("ABYBC", "Swich");
+ externalContext.getRequestParameterMap().put(panelBar.getClientId(facesContext), "Swich");
panelBar.decode(facesContext);
MockViewRoot mockViewRoot = (MockViewRoot) facesContext.getViewRoot();
EventsQueue events = mockViewRoot.getEventsQueue(facesContext,
- PhaseId.INVOKE_APPLICATION);
+ PhaseId.UPDATE_MODEL_VALUES);
assertNotNull(events);
FacesEvent event = (FacesEvent) events.remove();
assertTrue(events.isEmpty());
Modified: branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java
===================================================================
--- branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/togglePanel/src/test/java/org/richfaces/component/TogglePanelComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -233,12 +233,8 @@
assertTrue(((String) togglePanel.getValue()).equals("c"));
toggleControl.setSwitchToState("d");
- try {
- togglePanel.broadcast(new SwitchablePanelSwitchEvent(togglePanel,
- "null", toggleControl));
- assertTrue(false);
- } catch (Exception ex) {
- }
+ togglePanel.broadcast(new SwitchablePanelSwitchEvent(togglePanel,
+ "null", toggleControl));
}
/**
@@ -385,7 +381,7 @@
events = mockViewRoot.getEventsQueue(facesContext,
PhaseId.INVOKE_APPLICATION);
assertNotNull(events);
- assertTrue(events.isEmpty());
+ assertFalse(events.isEmpty());
}
/**
Modified: branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-12-11 18:25:13 UTC (rev 4733)
+++ branches/3.1.x/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2007-12-11 18:37:35 UTC (rev 4734)
@@ -92,8 +92,9 @@
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-selection.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-item.js");
javaScripts.add("org/richfaces/renderkit/html/scripts/tree-item-dnd.js");
- javaScripts.add("org/richfaces/renderkit/html/scripts/drag-indicator.js");
-
+ javaScripts.add("org/richfaces/renderkit/html/scripts/drag-indicator.js");
+
+ javaScripts.add("org/richfaces/renderkit/html/scripts/browser_info.js");
}
private static Set cssStyles = new HashSet();
18 years, 5 months
JBoss Rich Faces SVN: r4733 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-12-11 13:25:13 -0500 (Tue, 11 Dec 2007)
New Revision: 4733
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
Log:
RF-1582
Spinner button fixes
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2007-12-11 18:25:13 UTC (rev 4732)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2007-12-11 18:25:13 UTC (rev 4733)
@@ -202,10 +202,12 @@
// Repeat adjust at regular intervals
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
+ self.spinCfg._repeater = true;
})
.mouseup(function(e){
// Cancel repeating adjustment
+ self.spinCfg._repeater = false;
window.clearInterval(self.spinCfg._repeat);
window.clearTimeout(self.spinCfg._delay);
})
@@ -213,6 +215,15 @@
.dblclick(function(e) {
if (sbjQuery.browser.msie)
self.adjustValue(self.spinCfg.step);
+ })
+ .mouseout(function(e){
+ // Cancel repeating adjustment
+ if (self.spinCfg._repeater)
+ {
+ self.spinCfg._repeater = false
+ window.clearInterval(self.spinCfg._repeat);
+ window.clearTimeout(self.spinCfg._delay);
+ }
});
var btnDown = $(this.id + 'BtnDown');
@@ -231,10 +242,12 @@
// Repeat adjust at regular intervals
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
+ self.spinCfg._repeater = true;
})
.mouseup(function(e){
// Cancel repeating adjustment
+ self.spinCfg._repeater = false;
window.clearInterval(self.spinCfg._repeat);
window.clearTimeout(self.spinCfg._delay);
})
@@ -242,7 +255,17 @@
.dblclick(function(e) {
if (sbjQuery.browser.msie)
self.adjustValue(-self.spinCfg.step);
+ })
+ .mouseout(function(e){
+ // Cancel repeating adjustment
+ if (self.spinCfg._repeater)
+ {
+ self.spinCfg._repeater = false
+ window.clearInterval(self.spinCfg._repeat);
+ window.clearTimeout(self.spinCfg._delay);
+ }
});
+
if (this.addEventListener) {
// Respond to mouse wheel in Firefox
18 years, 5 months
JBoss Rich Faces SVN: r4732 - 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-11 13:25:13 -0500 (Tue, 11 Dec 2007)
New Revision: 4732
Modified:
branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
Log:
RF-1582
Spinner button fixes
Modified: branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
===================================================================
--- branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2007-12-11 18:11:07 UTC (rev 4731)
+++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2007-12-11 18:25:13 UTC (rev 4732)
@@ -202,10 +202,12 @@
// Repeat adjust at regular intervals
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
+ self.spinCfg._repeater = true;
})
.mouseup(function(e){
// Cancel repeating adjustment
+ self.spinCfg._repeater = false;
window.clearInterval(self.spinCfg._repeat);
window.clearTimeout(self.spinCfg._delay);
})
@@ -213,6 +215,15 @@
.dblclick(function(e) {
if (sbjQuery.browser.msie)
self.adjustValue(self.spinCfg.step);
+ })
+ .mouseout(function(e){
+ // Cancel repeating adjustment
+ if (self.spinCfg._repeater)
+ {
+ self.spinCfg._repeater = false
+ window.clearInterval(self.spinCfg._repeat);
+ window.clearTimeout(self.spinCfg._delay);
+ }
});
var btnDown = $(this.id + 'BtnDown');
@@ -231,10 +242,12 @@
// Repeat adjust at regular intervals
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
+ self.spinCfg._repeater = true;
})
.mouseup(function(e){
// Cancel repeating adjustment
+ self.spinCfg._repeater = false;
window.clearInterval(self.spinCfg._repeat);
window.clearTimeout(self.spinCfg._delay);
})
@@ -242,7 +255,17 @@
.dblclick(function(e) {
if (sbjQuery.browser.msie)
self.adjustValue(-self.spinCfg.step);
+ })
+ .mouseout(function(e){
+ // Cancel repeating adjustment
+ if (self.spinCfg._repeater)
+ {
+ self.spinCfg._repeater = false
+ window.clearInterval(self.spinCfg._repeat);
+ window.clearTimeout(self.spinCfg._delay);
+ }
});
+
if (this.addEventListener) {
// Respond to mouse wheel in Firefox
18 years, 5 months
JBoss Rich Faces SVN: r4731 - branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 13:11:07 -0500 (Tue, 11 Dec 2007)
New Revision: 4731
Modified:
branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
Log:
Tests for list shuttle changed.
Modified: branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java
===================================================================
--- branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-11 17:50:14 UTC (rev 4730)
+++ branches/3.1.x/ui/listShuttle/src/test/java/org/richfaces/renderkit/ListShuttleRenderingTest.java 2007-12-11 18:11:07 UTC (rev 4731)
@@ -193,7 +193,10 @@
List inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "id", listShuttle.getClientId(facesContext) + "focusKeeper");
assertNotNull(inputs);
- assertEquals(2, inputs.size());
+ assertEquals(1, inputs.size());
+ inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "id", listShuttle.getClientId(facesContext) + "tlFocusKeeper");
+ assertNotNull(inputs);
+ assertEquals(1, inputs.size());
inputs = view.getDocumentElement().getHtmlElementsByAttribute("input", "name", listShuttle.getClientId(facesContext));
assertNotNull(inputs);
18 years, 5 months
JBoss Rich Faces SVN: r4730 - trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-12-11 12:50:14 -0500 (Tue, 11 Dec 2007)
New Revision: 4730
Modified:
trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
Log:
RF-1453
Modified: trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11 17:45:27 UTC (rev 4729)
+++ trunk/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-12-11 17:50:14 UTC (rev 4730)
@@ -249,15 +249,6 @@
this.scrollBox.setHeight(this.getHeight()+1);
this.scrollBox.setWidth(this.getWidth());
this.scrollBox.setHeight(this.getHeight());
- var viewWidth = this.scrollBox.getViewportWidth();
- this.container.setWidth(viewWidth);
-
- if(ClientUILib.isIE) {
- this.contentBox.setWidth(viewWidth - frozenContentWidth);
- }
- else {
- this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
- }
height = this.scrollBox.getElement().clientHeight;
@@ -269,18 +260,26 @@
this.defaultRowHeight = this._calcDefaultRowHeight();
this.sizeBox.hide();
this.sizeBox.setHeight(this.defaultRowHeight * this.grid.dataModel.getCount() + fixH);
- this.sizeBox.show();
this.helpObject1.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
this.helpObject2.moveToY(this.sizeBox.getHeight()+ this.defaultRowHeight + 5);
-
- var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft);
- this.grid.adjustScrollPosition(scrollPos);
this.dataVisible = parseInt(this.contentBox.getHeight() / this.defaultRowHeight, 10) + 1;
this.dataVisible = Math.min(this.dataVisible, this.rowsCount);
if(height > 0) {
this.adjustDataPosition(this.currentPos);
}
+ this.sizeBox.show();
+ var viewWidth = this.scrollBox.getViewportWidth();
+ this.container.setWidth(viewWidth);
+
+ if(ClientUILib.isIE) {
+ this.contentBox.setWidth(viewWidth - frozenContentWidth);
+ }
+ else {
+ this.contentBox.setWidth(Math.max(this.getWidth(), totalWidth));
+ }
+ var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft);
+ this.grid.adjustScrollPosition(scrollPos);
},
adjustScrollPosition: function(pos) {
this.templNormal.moveToX(-pos);
18 years, 5 months
JBoss Rich Faces SVN: r4729 - trunk/samples/dataTableDemo/src/main/webapp/pages and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 12:45:27 -0500 (Tue, 11 Dec 2007)
New Revision: 4729
Modified:
branches/3.1.x/samples/dataTableDemo/src/main/webapp/pages/index.jsp
trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp
Log:
dataTable sample: added possibility to change skin 'on fly'
Modified: branches/3.1.x/samples/dataTableDemo/src/main/webapp/pages/index.jsp
===================================================================
--- branches/3.1.x/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-12-11 17:32:22 UTC (rev 4728)
+++ branches/3.1.x/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-12-11 17:45:27 UTC (rev 4729)
@@ -8,7 +8,12 @@
</head>
<body>
<f:view >
- <h:form>
+ <h:form id="skinForm" >
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ <h:outputText value=" Current skin: #{skinBean.skin}" /><br />
+ </h:form>
+ <h:form id="form" >
<h:panelGrid columns="3" border="1">
<data:dataTable id="master" var="master" value="#{data.mounths}"
styleClass="table" captionClass="caption" rowClasses="rowa,rowb,rowc rowcc"
Modified: trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-12-11 17:32:22 UTC (rev 4728)
+++ trunk/samples/dataTableDemo/src/main/webapp/pages/index.jsp 2007-12-11 17:45:27 UTC (rev 4729)
@@ -8,7 +8,12 @@
</head>
<body>
<f:view >
- <h:form>
+ <h:form id="skinForm" >
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ <h:outputText value=" Current skin: #{skinBean.skin}" /><br />
+ </h:form>
+ <h:form id="form" >
<h:panelGrid columns="3" border="1">
<data:dataTable id="master" var="master" value="#{data.mounths}"
styleClass="table" captionClass="caption" rowClasses="rowa,rowb,rowc rowcc"
18 years, 5 months
JBoss Rich Faces SVN: r4728 - in branches/3.1.x/ui: orderingList/src/main/resources/org/richfaces/renderkit/html/css and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-12-11 12:32:22 -0500 (Tue, 11 Dec 2007)
New Revision: 4728
Modified:
branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
Log:
Some colors changed for ordering components.
Modified: branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss
===================================================================
--- branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 17:16:02 UTC (rev 4727)
+++ branches/3.1.x/ui/listShuttle/src/main/resources/org/richfaces/renderkit/html/css/listShuttle.xcss 2007-12-11 17:32:22 UTC (rev 4728)
@@ -21,6 +21,7 @@
padding : 0px 2px;
border-style: solid;
border-left:0;
+ font-weight: normal;
}
.rich-shuttle-internal-tab {
@@ -143,6 +144,7 @@
border-left: 0;
white-space: nowrap;
padding : 2px;
+ font-weight: normal;
}
.rich-shuttle-source-cell, .rich-shuttle-target-cell {
@@ -182,11 +184,10 @@
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
- <u:style name="border-right-color" skin="panelBorderColor" />
+ <u:style name="border-bottom-color" skin="tableBorderColor" />
+ <u:style name="border-right-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-shuttle-header-tab-cell-last">
@@ -197,10 +198,9 @@
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
+ <u:style name="border-bottom-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-list-shuttle-button">
@@ -255,7 +255,6 @@
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
</u:selector>
<u:selector name=".rich-shuttle-source-cell-last, .rich-shuttle-target-cell-last">
@@ -264,7 +263,7 @@
<u:selector name=".rich-shuttle-source-items, .rich-shuttle-target-items">
<u:style name="background-color" skin="generalBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-color" skin="tableBorderColor" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-style" value="solid" />
</u:selector>
@@ -280,12 +279,12 @@
<u:style name="font-family" skin="generalFamilyFont" />
</u:selector>
<u:selector name=".rich-shuttle-source-cell-active, .rich-shuttle-target-cell-active" >
- <u:style name="border-top-color" skin="selectControlColor" />
- <u:style name="border-bottom-color" skin="selectControlColor" />
+ <u:style name="border-top-color" skin="generalTextColor" />
+ <u:style name="border-bottom-color" skin="generalTextColor" />
</u:selector>
<u:selector name=".rich-shuttle-control-disabled, .rich-shuttle-control-top, .rich-shuttle-control-bottom, .rich-shuttle-control-up, .rich-shuttle-control-down, .rich-shuttle-control-copyall, .rich-shuttle-control-copy, .rich-shuttle-control-remove, .rich-shuttle-control-removeall">
- <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-list-shuttle-button-content">
Modified: branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss
===================================================================
--- branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 17:16:02 UTC (rev 4727)
+++ branches/3.1.x/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/css/orderingList.xcss 2007-12-11 17:32:22 UTC (rev 4728)
@@ -146,13 +146,15 @@
.rich-ordering-list-table-header-cell {
background : none top left repeat-x;
border-style: solid solid solid none;
- padding : 2px;
+ padding : 2px;
+ font-weight: normal;
}
.rich-ordering-list-table-header-cell-last {
border-style: solid solid solid none;
border-right: 0;
white-space: nowrap;
+ font-weight: normal;
}
.rich-ordering-list-cell {
@@ -234,12 +236,11 @@
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
- <u:style name="border-right-color" skin="panelBorderColor" />
- <u:style name="border-left-color" skin="panelBorderColor" />
+ <u:style name="border-bottom-color" skin="tableBorderColor" />
+ <u:style name="border-right-color" skin="tableBorderColor" />
+ <u:style name="border-left-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-ordering-list-table-header-cell-last">
@@ -250,21 +251,20 @@
<u:style name="color" skin="headerTextColor" />
<u:style name="font-family" skin="headerFamilyFont" />
<u:style name="font-size" skin="headerSizeFont" />
- <u:style name="font-weight" skin="headerWeightFont" />
<u:style name="border-width" skin="tableBorderWidth" />
<u:style name="border-top-color" skin="subBorderColor" />
- <u:style name="border-bottom-color" skin="panelBorderColor" />
- <u:style name="border-left-color" skin="panelBorderColor" />
+ <u:style name="border-bottom-color" skin="tableBorderColor" />
+ <u:style name="border-left-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-ordering-list-items">
<u:style name="background-color" skin="generalBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-ordering-list-output">
<u:style name="background-color" skin="generalBackgroundColor" />
- <u:style name="border-color" skin="panelBorderColor" />
+ <u:style name="border-color" skin="tableBorderColor" />
</u:selector>
<u:selector name=".rich-ordering-list-cell, .rich-ordering-list-cell *">
@@ -287,25 +287,13 @@
<u:selector name=".rich-ordering-list-cell-active">
<u:style name="font-size" skin="generalSizeFont" />
<u:style name="font-family" skin="generalFamilyFont" />
- <u:style name="border-top-color" skin="selectControlColor" />
- <u:style name="border-bottom-color" skin="selectControlColor" />
+ <u:style name="border-top-color" skin="generalTextColor" />
+ <u:style name="border-bottom-color" skin="generalTextColor" />
</u:selector>
- <u:selector name=".rich-ordering-control-disabled">
- <u:style name="border-color" skin="panelBorderColor" />
+ <u:selector name=".rich-ordering-control-disabled, .rich-ordering-control-top, .rich-ordering-control-bottom, .rich-ordering-control-up, .rich-ordering-control-down">
+ <u:style name="border-color" skin="tableBorderColor" />
</u:selector>
- <u:selector name=".rich-ordering-control-top">
- <u:style name="border-color" skin="panelBorderColor" />
- </u:selector>
- <u:selector name=".rich-ordering-control-bottom">
- <u:style name="border-color" skin="panelBorderColor" />
- </u:selector>
- <u:selector name=".rich-ordering-control-up">
- <u:style name="border-color" skin="panelBorderColor" />
- </u:selector>
- <u:selector name=".rich-ordering-control-down">
- <u:style name="border-color" skin="panelBorderColor" />
- </u:selector>
<u:selector name=".rich-ordering-list-button-content">
<u:style name="font-family" skin="headerFamilyFont" />
18 years, 5 months
JBoss Rich Faces SVN: r4727 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2007-12-11 12:16:02 -0500 (Tue, 11 Dec 2007)
New Revision: 4727
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1582
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-11 17:13:51 UTC (rev 4726)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-11 17:16:02 UTC (rev 4727)
@@ -207,6 +207,58 @@
return {left:windowOffset.left, top:windowOffset.top, right: windowDim.width+windowOffset.left, bottom: windowDim.height+windowOffset.top};
};
+Richfaces.Calendar.clonePosition = function (elements, source)
+{
+ if (!elements.length) elements = [elements];
+ var offset = Position.cumulativeOffset(source);
+ offset = {left:offset[0], top:offset[1]};
+ var offsetTemp;
+ if (source.style.position!='absolute')
+ {
+ offsetTemp = Position.realOffset(source);
+ offset.left -= offsetTemp.left;
+ offset.top -= offsetTemp.top;
+ offsetTemp = Richfaces.Calendar.getWindowScrollOffset();
+ offset.left += offsetTemp.left;
+ offset.top += offsetTemp.top;
+ }
+
+ for (var i=0;i<elements.length;i++)
+ {
+ offsetTemp = Richfaces.Calendar.getParentOffset(elements[i]);
+ elements[i].style.left = (offset.left - offsetTemp.left) + 'px';
+ elements[i].style.top = (offset.top - offsetTemp.top) + 'px';
+ }
+ return offset;
+};
+
+Richfaces.Calendar.getParentOffset = function(element)
+{
+ var offset = {left:0,top:0};
+ var els = element.style;
+ if (els.display!='none')
+ {
+ if (element.offsetParent && element.offsetParent!=document.body)
+ offset = Position.cumulativeOffset(element.offsetParent);
+ }
+ else
+ {
+ var originalVisibility = els.visibility;
+ var originalPosition = els.position;
+ var originalDisplay = els.display;
+ els.visibility = 'hidden';
+ els.position = 'absolute';
+ els.display = '';
+ if (element.offsetParent && element.offsetParent!=document.body)
+ offset = Position.cumulativeOffset(element.offsetParent);
+ els.display = originalDisplay;
+ els.position = originalPosition;
+ els.visibility = originalVisibility;
+ }
+
+ return offset;
+};
+
Richfaces.Calendar.joinArray = function(array, begin, end, separator)
{
var value = '';
@@ -698,7 +750,9 @@
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');
+ var zindex = element.getStyle('z-index');
+ te_shadow.style.zIndex = zindex;
+ te.style.zIndex = parseInt(zindex,10)+1;
var th=$(this.id+'TimeHours');
var ts;
@@ -947,8 +1001,8 @@
if (Event.element(e).id == this.POPUP_BUTTON_ID || (!this.params.enableManualInput && Event.element(e).id == this.INPUT_DATE_ID) ) return true;
- Position.prepare();
- if (Position.withinIncludingScrolloffsets($(this.id), Event.pointerX(e), Event.pointerY(e))) return true;
+ //Position.prepare();
+ if (Position.within($(this.id), Event.pointerX(e), Event.pointerY(e))) return true;
this.doCollapse();
return true;
@@ -1633,15 +1687,20 @@
if (this.selectedDate!=null)
{
if (this.timeType && !isDateParsed)
+ {
if (oldSelectedDate!=null)
{
this.selectedDate.setHours(oldSelectedDate.getHours());
this.selectedDate.setMinutes(oldSelectedDate.getMinutes());
+
}
else
{
this.selectedDate.setHours(12);
+ this.selectedDate.setMinutes(0);
}
+ this.selectedDate.setSeconds(0);
+ }
if (!this.showApplyButton) field.value=this.getSelectedDateString(this.params.datePattern);
@@ -1771,16 +1830,14 @@
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;
- //Element.clonePosition(te, element);
- //Element.clonePosition(te_shadow, element);
+ Richfaces.Calendar.clonePosition([te,te_shadow], element);
this.updateTimeEditor();
+ te_shadow.show();
te.show();
- te_shadow.show();
+
Element.clonePosition(this.TIME_EDITOR_LAYOUT_SHADOW_ID, this.TIME_EDITOR_LAYOUT_ID, {offsetLeft: 3, offsetTop: 3});
},
@@ -1857,7 +1914,7 @@
CalendarView.todayControl = function (context) { return (context.calendar.todayControlMode!='hidden' ? CalendarView.getControl("Today", CalendarView.toolButtonAttributes, "today") : "");};
CalendarView.selectedDateControl = function (context) { return CalendarView.getSelectedDateControl(context.calendar);};
CalendarView.timeControl = function (context) { return CalendarView.getTimeControl(context.calendar);};
-CalendarView.closeControl = CalendarView.getControl("x", CalendarView.toolButtonAttributes, "close", "false");
+CalendarView.closeControl = function (context) { return (context.calendar.params.popup ? CalendarView.getControl("x", CalendarView.toolButtonAttributes, "close", "false") : "");};
CalendarView.applyControl = function (context) { return (context.calendar.showApplyButton ? CalendarView.getControl("Apply", CalendarView.toolButtonAttributes, "close", "true") : "");};
CalendarView.cleanControl = function (context) { return (context.calendar.selectedDate ? CalendarView.getControl("Clean", CalendarView.toolButtonAttributes, "resetSelectedDate") : "");};
CalendarView.timeEditorFields = function (context) { return context.calendar.timePatternHtml;};
@@ -1889,7 +1946,7 @@
[
new ET(function (context) { return Richfaces.evalMacro("nextYearControl", context)})
]),
- new E('td',{'class': 'rich-calendar-tool rich-calendar-tool-close'},
+ new E('td',{'class': 'rich-calendar-tool rich-calendar-tool-close', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}},
[
new ET(function (context) { return Richfaces.evalMacro("closeControl", context)})
])
18 years, 5 months
JBoss Rich Faces SVN: r4726 - branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2007-12-11 12:13:51 -0500 (Tue, 11 Dec 2007)
New Revision: 4726
Modified:
branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
Log:
Modified: branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml
===================================================================
--- branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 17:11:21 UTC (rev 4725)
+++ branches/3.1.x/samples/richfaces-demo/src/main/webapp/richfaces/listShuttle/examples/toolBarCustomization.xhtml 2007-12-11 17:13:51 UTC (rev 4726)
@@ -35,6 +35,9 @@
targetCaptionLabel="Currently Active Items"
converter="listShuttleconverter">
<rich:column>
+ <h:graphicImage value="#{items.iconURI}"></h:graphicImage>
+ </rich:column>
+ <rich:column>
<h:outputText value="#{items.label}"></h:outputText>
</rich:column>
<a4j:support event="onorderchanged" reRender="toolBar"></a4j:support>
18 years, 5 months
JBoss Rich Faces SVN: r4725 - 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-11 12:11:21 -0500 (Tue, 11 Dec 2007)
New Revision: 4725
Modified:
branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1582
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-11 16:51:26 UTC (rev 4724)
+++ branches/3.1.x/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2007-12-11 17:11:21 UTC (rev 4725)
@@ -207,6 +207,58 @@
return {left:windowOffset.left, top:windowOffset.top, right: windowDim.width+windowOffset.left, bottom: windowDim.height+windowOffset.top};
};
+Richfaces.Calendar.clonePosition = function (elements, source)
+{
+ if (!elements.length) elements = [elements];
+ var offset = Position.cumulativeOffset(source);
+ offset = {left:offset[0], top:offset[1]};
+ var offsetTemp;
+ if (source.style.position!='absolute')
+ {
+ offsetTemp = Position.realOffset(source);
+ offset.left -= offsetTemp.left;
+ offset.top -= offsetTemp.top;
+ offsetTemp = Richfaces.Calendar.getWindowScrollOffset();
+ offset.left += offsetTemp.left;
+ offset.top += offsetTemp.top;
+ }
+
+ for (var i=0;i<elements.length;i++)
+ {
+ offsetTemp = Richfaces.Calendar.getParentOffset(elements[i]);
+ elements[i].style.left = (offset.left - offsetTemp.left) + 'px';
+ elements[i].style.top = (offset.top - offsetTemp.top) + 'px';
+ }
+ return offset;
+};
+
+Richfaces.Calendar.getParentOffset = function(element)
+{
+ var offset = {left:0,top:0};
+ var els = element.style;
+ if (els.display!='none')
+ {
+ if (element.offsetParent && element.offsetParent!=document.body)
+ offset = Position.cumulativeOffset(element.offsetParent);
+ }
+ else
+ {
+ var originalVisibility = els.visibility;
+ var originalPosition = els.position;
+ var originalDisplay = els.display;
+ els.visibility = 'hidden';
+ els.position = 'absolute';
+ els.display = '';
+ if (element.offsetParent && element.offsetParent!=document.body)
+ offset = Position.cumulativeOffset(element.offsetParent);
+ els.display = originalDisplay;
+ els.position = originalPosition;
+ els.visibility = originalVisibility;
+ }
+
+ return offset;
+};
+
Richfaces.Calendar.joinArray = function(array, begin, end, separator)
{
var value = '';
@@ -698,7 +750,9 @@
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');
+ var zindex = element.getStyle('z-index');
+ te_shadow.style.zIndex = zindex;
+ te.style.zIndex = parseInt(zindex,10)+1;
var th=$(this.id+'TimeHours');
var ts;
@@ -947,8 +1001,8 @@
if (Event.element(e).id == this.POPUP_BUTTON_ID || (!this.params.enableManualInput && Event.element(e).id == this.INPUT_DATE_ID) ) return true;
- Position.prepare();
- if (Position.withinIncludingScrolloffsets($(this.id), Event.pointerX(e), Event.pointerY(e))) return true;
+ //Position.prepare();
+ if (Position.within($(this.id), Event.pointerX(e), Event.pointerY(e))) return true;
this.doCollapse();
return true;
@@ -1633,15 +1687,20 @@
if (this.selectedDate!=null)
{
if (this.timeType && !isDateParsed)
+ {
if (oldSelectedDate!=null)
{
this.selectedDate.setHours(oldSelectedDate.getHours());
this.selectedDate.setMinutes(oldSelectedDate.getMinutes());
+
}
else
{
this.selectedDate.setHours(12);
+ this.selectedDate.setMinutes(0);
}
+ this.selectedDate.setSeconds(0);
+ }
if (!this.showApplyButton) field.value=this.getSelectedDateString(this.params.datePattern);
@@ -1771,26 +1830,12 @@
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';
+
+ Richfaces.Calendar.clonePosition([te,te_shadow], element);
- //Element.clonePosition(te, element);
- //Element.clonePosition(te_shadow, element);
-
this.updateTimeEditor();
- te_shadow.style.visibility = 'hidden';
te_shadow.show();
-
- te_shadow.style.left = '0px';
- te_shadow.style.top = '0px';
-
- var o1 = element.cumulativeOffset();
- var o2 = te_shadow.cumulativeOffset();
-
- te.style.left = te_shadow.style.left = (o1[0] - o2[0]) + 'px';
- te.style.top = te_shadow.style.top = (o1[1] - o2[1]) + 'px';
-
- te_shadow.style.visibility = '';
-
te.show();
Element.clonePosition(this.TIME_EDITOR_LAYOUT_SHADOW_ID, this.TIME_EDITOR_LAYOUT_ID, {offsetLeft: 3, offsetTop: 3});
@@ -1869,7 +1914,7 @@
CalendarView.todayControl = function (context) { return (context.calendar.todayControlMode!='hidden' ? CalendarView.getControl("Today", CalendarView.toolButtonAttributes, "today") : "");};
CalendarView.selectedDateControl = function (context) { return CalendarView.getSelectedDateControl(context.calendar);};
CalendarView.timeControl = function (context) { return CalendarView.getTimeControl(context.calendar);};
-CalendarView.closeControl = CalendarView.getControl("x", CalendarView.toolButtonAttributes, "close", "false");
+CalendarView.closeControl = function (context) { return (context.calendar.params.popup ? CalendarView.getControl("x", CalendarView.toolButtonAttributes, "close", "false") : "");};
CalendarView.applyControl = function (context) { return (context.calendar.showApplyButton ? CalendarView.getControl("Apply", CalendarView.toolButtonAttributes, "close", "true") : "");};
CalendarView.cleanControl = function (context) { return (context.calendar.selectedDate ? CalendarView.getControl("Clean", CalendarView.toolButtonAttributes, "resetSelectedDate") : "");};
CalendarView.timeEditorFields = function (context) { return context.calendar.timePatternHtml;};
@@ -1901,7 +1946,7 @@
[
new ET(function (context) { return Richfaces.evalMacro("nextYearControl", context)})
]),
- new E('td',{'class': 'rich-calendar-tool rich-calendar-tool-close'},
+ new E('td',{'class': 'rich-calendar-tool rich-calendar-tool-close', 'style':function(context){return (this.isEmpty ? 'display:none;' : '');}},
[
new ET(function (context) { return Richfaces.evalMacro("closeControl", context)})
])
18 years, 5 months