1:16 p.m.
Author: Alex.Kolonitsky
Date: 2009-11-24 14:16:28 -0500 (Tue, 24 Nov 2009)
New Revision: 15990
Added:
branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp
Modified:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp
branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
https://jira.jboss.org/jira/browse/RF-8159
problem with framsets and rich:calendar
Added:
branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java
(rev 0)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/java/org/richfaces/RF8052.java 2009-11-24
19:16:28 UTC (rev 15990)
@@ -0,0 +1,40 @@
+/**
+ * License Agreement.
+ *
+ * Rich Faces - Natural Ajax for Java Server Faces (JSF)
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces;
+
+import java.util.Date;
+
+/**
+ * @author akolonitsky
+ * @since Nov 24, 2009
+ */
+public class RF8052 {
+ private Date date = new Date();
+
+ public Date getDate() {
+ return new Date();
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+}
Modified:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24
17:21:30 UTC (rev 15989)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/WEB-INF/faces-config.xml 2009-11-24
19:16:28 UTC (rev 15990)
@@ -17,6 +17,11 @@
<managed-bean-class>org.richfaces.CalendarBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>rf8052</managed-bean-name>
+ <managed-bean-class>org.richfaces.RF8052</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
<validator>
<validator-id>org.richfaces.CalendarValidator</validator-id>
<validator-class>org.richfaces.CalendarValidator</validator-class>
Added:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html
(rev 0)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/RF-8052.html 2009-11-24
19:16:28 UTC (rev 15990)
@@ -0,0 +1,8 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/frameset.dtd" >
+<html>
+<frameset id="MainFrameSet" cols="195px,100%">
+ <frame id="frameThree" name="buttonsPanelFrame"
src="menu.jsf" />
+ <frame id="frameTwo" name="detailsPanelFrame" />
+</frameset>
+</html>
\ No newline at end of file
Added:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp
(rev 0)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/menu.jsp 2009-11-24
19:16:28 UTC (rev 15990)
@@ -0,0 +1,16 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar"
prefix="rich" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/panelmenu"
prefix="pm" %>
+<html>
+<body>
+<f:view>
+ <h:outputLink id="link" target="detailsPanelFrame"
value="other.jsf">
+ <h:outputText value="Click me (#{rf8052.date})" />
+ </h:outputLink>
+ <h:outputLink id="link2" target="qwe"
value="other.jsf">
+ <h:outputText value="Click me 2 (#{rf8052.date})" />
+ </h:outputLink>
+</f:view>
+</body>
+</html>
\ No newline at end of file
Added:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp
(rev 0)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/RF-8052/other.jsp 2009-11-24
19:16:28 UTC (rev 15990)
@@ -0,0 +1,12 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar"
prefix="rich" %>
+<html>
+<body>
+<f:view>
+ <rich:calendar id="calendar" /><br />
+ <h:outputText value="#{rf8052.date}" />
+</f:view>
+
+</body>
+</html>
\ No newline at end of file
Modified:
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp
===================================================================
---
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp 2009-11-24
17:21:30 UTC (rev 15989)
+++
branches/community/3.3.X/samples/calendar-sample/src/main/webapp/pages/index.jsp 2009-11-24
19:16:28 UTC (rev 15990)
@@ -1,19 +1,19 @@
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/ui/calendar"
prefix="calendar" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar"
prefix="calendar" %>
<html>
<head>
<title></title>
</head>
<body>
<f:view>
- <h:form>
- <h:panelGrid columns="1">
- <h:selectOneRadio binding="#{skinBean.component}" />
- <h:commandLink action="#{skinBean.change}" value="set
skin" />
- </h:panelGrid>
- <br />
+ <h:form>
+ <h:panelGrid columns="1">
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set
skin" />
+ </h:panelGrid>
<br />
+ <br />
<calendar:calendar id="calendar"
dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}">
<f:facet name="header">
<f:verbatim>
Modified:
branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
---
branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-24
17:21:30 UTC (rev 15989)
+++
branches/community/3.3.X/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2009-11-24
19:16:28 UTC (rev 15990)
@@ -599,7 +599,7 @@
var value = options.labels || {};
var defaultLabels = {apply:'Apply', today:'Today',
clean:'Clean', ok:'OK', cancel:'Cancel', close:'x'};
- for (name in defaultLabels) {
+ for (var name in defaultLabels) {
if (!value[name]) value[name] = defaultLabels[name];
}
this.params.labels = value;