Added internationalization support.

Added new version of fullcalendar. Added listeners for dateRangeSelectedEvent.

Added internationalization support.
Added new version of fullcalendar. Added listeners for dateRangeSelectedEvent.
bernard
1 parent 327ce896
Showing 14 changed files with 482 additions and 82 deletions
src/main/config/component/listeners.ent
src/main/config/component/schedule.xml
src/main/java/org/richfaces/component/UISchedule.java
src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedEvent.java
src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedListener.java
src/main/java/org/richfaces/component/event/ScheduleListenerEventsProducer.java
src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java
src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
src/main/resources/org/richfaces/component/UIScheduleMessages_en.properties
src/main/resources/org/richfaces/component/UIScheduleMessages_pl.properties
src/main/resources/org/richfaces/component/scheduleMessages.properties
src/main/resources/org/richfaces/renderkit/html/scripts/fullcalendar.js
src/main/resources/org/richfaces/renderkit/html/scripts/richfaces.schedule.js
src/main/templates/org/richfaces/htmlSchedule.jspx
--- a/src/main/config/component/listeners.ent
View file @7f8bc29
+++ b/src/main/config/component/listeners.ent
View file @7f8bc29
@@ -177,6 +177,41 @@
         <description>The fully qualified Java class name for the listener</description>
     </property>
 </listener>
+<listener>
+    <name>dateRangeSelectedListener</name>
+    <property existintag="true" exist="true" el="true" elonly="true">
+        <name>binding</name>
+        <classname>org.richfaces.scheduleDateRangeChangedListener</classname>
+        <description>The attribute takes a value-binding expression for a component property of
+                            a backing bean
+        </description>
+    </property>
+    <listenerclass>
+        org.richfaces.component.event.ScheduleDateRangeSelectedListener
+    </listenerclass>
+    <componentclass>
+        org.richfaces.component.event.ScheduleListenerEventsProducer
+    </componentclass>
+    <eventclass>
+        org.richfaces.component.event.ScheduleDateRangeSelectedEvent
+    </eventclass>
+    <taghandler generate="true">
+        <classname>
+                org.richfaces.taglib.ScheduleDateRangeSelectedListenerTagHandler
+        </classname>
+    </taghandler>
+    <tag generate="true">
+        <classname>
+                org.richfaces.taglib.DateRangeSelectedListenerTag
+        </classname>
+    </tag>
+
+    <property existintag="true" exist="true" el="false">
+        <name>type</name>
+        <classname>java.lang.String</classname>
+        <description>The fully qualified Java class name for the listener</description>
+    </property>
+</listener>
 <listener>
     <name>dateSelectedListener</name>
--- a/src/main/config/component/schedule.xml
View file @7f8bc29
+++ b/src/main/config/component/schedule.xml
View file @7f8bc29
@@ -364,6 +364,56 @@
             <defaultvalue>null</defaultvalue>
         </property>
         <property>
+            <name>selectable</name>
+            <classname>java.lang.Boolean</classname>
+            <description>
+                Allows a user to highlight multiple days or timeslots by clicking and dragging.
+                To let the user make selections by clicking and dragging, this option must be set to true.
+                default: false
+            </description>
+            <defaultvalue>null</defaultvalue>
+        </property>
+        <property>
+            <name>selectHelper</name>
+            <classname>java.lang.Boolean</classname>
+            <description>
+                Whether to draw a "placeholder" event while the user is dragging.
+                A value of true will draw a "placeholder" event while the user
+                is dragging (similar to what Google Calendar does for its week
+                and day views). A value of false (the default) will draw
+                the standard highlighting over each cell.
+                default: false
+            </description>
+            <defaultvalue>null</defaultvalue>
+        </property>
+        <property>
+            <name>unselectAuto</name>
+            <classname>java.lang.Boolean</classname>
+            <description>
+                Whether clicking elsewhere on the page will cause the current
+                selection to be cleared.
+                This option can only take effect when selectable is set to true.
+                default: true
+            </description>
+            <defaultvalue>null</defaultvalue>
+        </property>
+        <property>
+            <name>unselectCancel</name>
+            <classname>java.lang.String</classname>
+            <description>
+                A way to specify elements that will ignore the unselectAuto option.
+                Clicking on elements that match this jQuery selector will prevent
+                the current selection from being cleared (due to the unselectAuto option).
+                This option is useful if you have a "Create an event" form that
+                shows up in response to the user making a selection. When the user
+                clicks on this form, you probably don't want to the current selection
+                to go away. Thus, you should add a class to your form such as "my-form",
+                and set the unselectAuto option to ".my-form".
+                default: ''
+            </description>
+            <defaultvalue>null</defaultvalue>
+        </property>
+        <property>
             <name>disableDragging</name>
             <classname>java.lang.Boolean</classname>
             <description>
@@ -491,6 +541,14 @@
             <defaultvalue>null</defaultvalue>
         </property>
         <property>
+            <name>onDateRangeSelected</name>
+            <classname>java.lang.String</classname>
+            <description>
+                <!--TODO add description here-->
+            </description>
+            <defaultvalue>null</defaultvalue>
+        </property>
+        <property>
             <name>styleClass</name>
             <classname>java.lang.String</classname>
             <description>
@@ -527,6 +585,11 @@
         </property>
         <property elonly="true" attachedstate="true">
+            <name>dateRangeSelectedListener</name>
+            <classname>javax.faces.el.MethodBinding</classname>
+        </property>
+
+        <property elonly="true" attachedstate="true">
             <name>dateSelectedListener</name>
             <classname>javax.faces.el.MethodBinding</classname>
         </property>
--- a/src/main/java/org/richfaces/component/UISchedule.java
View file @7f8bc29
+++ b/src/main/java/org/richfaces/component/UISchedule.java
View file @7f8bc29
 package org.richfaces.component;
-import org.richfaces.component.event.ScheduleViewChangedEvent;
-import org.richfaces.component.event.ScheduleDateRangeChangedEvent;
-import org.richfaces.component.event.ScheduleItemResizeEvent;
-import org.richfaces.component.event.ScheduleItemSelectedEvent;
 import org.ajax4jsf.context.AjaxContext;
 import org.ajax4jsf.model.DataVisitor;
 import org.ajax4jsf.model.ExtendedDataModel;
+import org.richfaces.component.event.*;
+import org.richfaces.component.model.DateRange;
 import javax.el.ELContext;
 import javax.el.ValueExpression;
@@ -24,17 +22,6 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import org.richfaces.component.event.ScheduleDateRangeChangedListener;
-import org.richfaces.component.event.ScheduleDateSelectedEvent;
-import org.richfaces.component.event.ScheduleDateSelectedListener;
-import org.richfaces.component.event.ScheduleItemSelectedListener;
-import org.richfaces.component.event.ScheduleItemMoveEvent;
-import org.richfaces.component.event.ScheduleItemMoveListener;
-import org.richfaces.component.event.ScheduleItemResizeListener;
-import org.richfaces.component.event.ScheduleListenerEventsProducer;
-import org.richfaces.component.event.ScheduleViewChangedListener;
-import org.richfaces.component.model.DateRange;
-
 public abstract class UISchedule extends UIComponentBase implements ScheduleCommonViewAttributes, ScheduleListenerEventsProducer {
     public static final String COMPONENT_TYPE = "org.richfaces.Schedule";
@@ -147,6 +134,22 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
     public abstract void setEditable(Boolean editable);
+    public abstract Boolean getSelectable();
+
+    public abstract void setSelectable(Boolean selectable);
+
+    public abstract Boolean getSelectHelper();
+
+    public abstract void setSelectHelper(Boolean selectHelper);
+
+    public abstract Boolean getUnselectAuto();
+
+    public abstract void setUnselectAuto(Boolean unselectAuto);
+
+    public abstract String getUnselectCancel();
+
+    public abstract void setUnselectCancel(String unselectCancel);
+
     public abstract Boolean getDisableDragging();
     public abstract void setDisableDragging(Boolean disableDragging);
@@ -211,7 +214,12 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
     public abstract void setOnDateSelected(String onDaySelected);
+    public abstract String getOnDateRangeSelected();
+
+    public abstract void setOnDateRangeSelected(String onDateRangeSelected);
+
     // TODO do we use MethodBinding or MethodExpression?
+
     public abstract MethodBinding getItemMoveListener();
     public abstract void setItemMoveListener(MethodBinding listener);
@@ -232,6 +240,10 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
     public abstract void setDateRangeChangedListener(MethodBinding listener);
+    public abstract MethodBinding getDateRangeSelectedListener();
+
+    public abstract void setDateRangeSelectedListener(MethodBinding listener);
+
     public abstract MethodBinding getDateSelectedListener();
     public abstract void setDateSelectedListener(MethodBinding listener);
@@ -295,6 +307,13 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
             if (expression != null) {
                 expression.invoke(facesContext, new Object[]{event});
             }
+        } else if (event instanceof ScheduleDateRangeSelectedEvent) {
+            super.broadcast(event);
+            FacesContext facesContext = getFacesContext();
+            MethodBinding expression = getDateRangeSelectedListener();
+            if (expression != null) {
+                expression.invoke(facesContext, new Object[]{event});
+            }
         }
     }
@@ -316,7 +335,7 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
         DataModel dataModel = getDataModel();
         if (dataModel instanceof ExtendedDataModel) {
             DataVisitor visitor = new DataVisitor() {
-                //TODO Is this fine? or should we stack rowKeys and not use dataModel later on. I'don't know business rules of extendedDataModel, just used it to did once pagination with underlying EntityQuery from Seam
+                //TODO Is this fine? or should we stack rowKeys and not use dataModel later on. I'don't know business rules of extendedDataModel, just used it once to do pagination with underlying EntityQuery from Seam
                 public void process(FacesContext context, Object rowKey, Object argument) throws IOException {
                 }
@@ -595,6 +614,18 @@ public abstract class UISchedule extends UIComponentBase implements ScheduleComm
         return (ScheduleDateRangeChangedListener[]) getFacesListeners(ScheduleDateRangeChangedListener.class);
     }
+    public void addDateRangeSelectedListener(ScheduleDateRangeSelectedListener listener) {
+        addFacesListener(listener);
+    }
+
+    public void removeDateRangeSelectedListener(ScheduleDateRangeSelectedListener listener) {
+        removeFacesListener(listener);
+    }
+
+    public ScheduleDateRangeSelectedListener[] getDateRangeSelectedListeners() {
+        return (ScheduleDateRangeSelectedListener[]) getFacesListeners(ScheduleDateRangeSelectedListener.class);
+    }
+
     public void addDateSelectedListener(ScheduleDateSelectedListener listener) {
         addFacesListener(listener);
     }
--- a/src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedEvent.java 0 → 100644
View file @7f8bc29
+++ b/src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedEvent.java 0 → 100644
View file @7f8bc29
+package org.richfaces.component.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+import java.util.Date;
+
+public class ScheduleDateRangeSelectedEvent extends FacesEvent {
+
+    private Date startDate;
+    private Date endDate;
+    private boolean allDay;
+
+    public ScheduleDateRangeSelectedEvent(UIComponent component, Date startDate, Date endDate, boolean allDay) {
+        super(component);
+        this.startDate = startDate;
+        this.endDate = endDate;
+        this.allDay = allDay;
+    }
+
+    public boolean isAppropriateListener(FacesListener facesListener) {
+        return facesListener instanceof ScheduleDateSelectedListener;
+    }
+
+    public void processListener(FacesListener facesListener) {
+        ((ScheduleDateRangeSelectedListener) facesListener).dateRangeSelected(this);
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public boolean isAllDay() {
+        return allDay;
+    }
+
+    @Override
+    public String toString() {
+        return getClass().getSimpleName() + "[startDate=" + startDate + ";endDate=" + endDate + ";allDay=" + allDay + "]";
+    }
+}
--- a/src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedListener.java 0 → 100644
View file @7f8bc29
+++ b/src/main/java/org/richfaces/component/event/ScheduleDateRangeSelectedListener.java 0 → 100644
View file @7f8bc29
+package org.richfaces.component.event;
+
+import javax.faces.event.FacesListener;
+
+public interface ScheduleDateRangeSelectedListener extends FacesListener {
+
+    void dateRangeSelected(ScheduleDateRangeSelectedEvent event);
+}
--- a/src/main/java/org/richfaces/component/event/ScheduleListenerEventsProducer.java
View file @7f8bc29
+++ b/src/main/java/org/richfaces/component/event/ScheduleListenerEventsProducer.java
View file @7f8bc29
@@ -3,26 +3,44 @@ package org.richfaces.component.event;
 public interface ScheduleListenerEventsProducer {
     void addItemSelectedListener(ScheduleItemSelectedListener listener);
+
     void removeItemSelectedListener(ScheduleItemSelectedListener listener);
+
     ScheduleItemSelectedListener[] getItemSelectedListeners();
     void addItemMoveListener(ScheduleItemMoveListener listener);
+
     void removeItemMoveListener(ScheduleItemMoveListener listener);
+
     ScheduleItemMoveListener[] getItemMoveListeners();
     void addItemResizeListener(ScheduleItemResizeListener listener);
+
     void removeItemResizeListener(ScheduleItemResizeListener listener);
+
     ScheduleItemResizeListener[] getItemResizeListeners();
     void addViewChangedListener(ScheduleViewChangedListener listener);
+
     void removeViewChangedListener(ScheduleViewChangedListener listener);
+
     ScheduleViewChangedListener[] getViewChangedListeners();
     void addDateRangeChangedListener(ScheduleDateRangeChangedListener listener);
+
     void removeDateRangeChangedListener(ScheduleDateRangeChangedListener listener);
+
     ScheduleDateRangeChangedListener[] getDateRangeChangedListeners();
+    void addDateRangeSelectedListener(ScheduleDateRangeSelectedListener listener);
+
+    void removeDateRangeSelectedListener(ScheduleDateRangeSelectedListener listener);
+
+    ScheduleDateRangeSelectedListener[] getDateRangeSelectedListeners();
+
     void addDateSelectedListener(ScheduleDateSelectedListener listener);
+
     void removeDateSelectedListener(ScheduleDateSelectedListener listener);
+
     ScheduleDateSelectedListener[] getDateSelectedListeners();
 }
--- a/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java
View file @7f8bc29
+++ b/src/main/java/org/richfaces/renderkit/ScheduleRendererBase.java
View file @7f8bc29
 package org.richfaces.renderkit;
-import java.util.Locale;
-import org.richfaces.component.event.ScheduleViewChangedEvent;
-import org.richfaces.component.event.ScheduleDateRangeChangedEvent;
-import org.richfaces.component.event.ScheduleItemResizeEvent;
-import org.richfaces.component.event.ScheduleItemSelectedEvent;
 import org.ajax4jsf.javascript.JSFunction;
 import org.ajax4jsf.javascript.JSFunctionDefinition;
 import org.ajax4jsf.javascript.JSObject;
@@ -12,21 +7,15 @@ import org.ajax4jsf.javascript.JSReference;
 import org.ajax4jsf.renderkit.AjaxComponentRendererBase;
 import org.ajax4jsf.renderkit.AjaxRendererUtils;
 import org.richfaces.component.*;
+import org.richfaces.component.event.*;
+import javax.faces.FacesException;
 import javax.faces.component.NamingContainer;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 import java.io.IOException;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.faces.FacesException;
-
-import org.richfaces.component.event.ScheduleDateSelectedEvent;
-import org.richfaces.component.event.ScheduleItemMoveEvent;
+import java.util.*;
 public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
@@ -36,6 +25,7 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
     public static final String DATE_RANGE_CHANGED_EVENT = "dateRangeChanged";
     public static final String VIEW_CHANGED_EVENT = "viewChanged";
     public static final String DATE_SELECTED_EVENT = "dateSelected";
+    public static final String DATE_RANGE_SELECTED_EVENT = "dateRangeSelected";
     public static final String AJAX_MODE = "ajax";
     public static final String SERVER_MODE = "server";
     public static final String CLIENT_MODE = "client";
@@ -50,7 +40,7 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
     private static final String VIEW_PARAM = "view";
     protected Object createSubmitEventFunction(FacesContext context, UISchedule component) {
-        JSFunction jsFunction = null;
+        JSFunction jsFunction;
         Map<String, Object> params = new HashMap<String, Object>();
         params.put(getFieldId(context, component, START_DATE_PARAM), new JSReference(START_DATE_PARAM));
         params.put(getFieldId(context, component, END_DATE_PARAM), new JSReference(END_DATE_PARAM));
@@ -115,6 +105,11 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
                     Date startDate = new Date(Long.parseLong(startDateParam) * 1000);
                     boolean allDay = Boolean.parseBoolean(allDayParam);
                     new ScheduleDateSelectedEvent(component, startDate, allDay).queue();
+                } else if (DATE_RANGE_SELECTED_EVENT.equals(eventTypeParam)) {
+                    Date startDate = new Date(Long.parseLong(startDateParam) * 1000);
+                    Date endDate = new Date(Long.parseLong(endDateParam) * 1000);
+                    boolean allDay = Boolean.parseBoolean(allDayParam);
+                    new ScheduleDateRangeSelectedEvent(component, startDate, endDate, allDay).queue();
                 }
             } catch (NumberFormatException ex) {
                 throw new FacesException("Cannot convert request parmeters", ex);
@@ -126,7 +121,7 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         ResponseWriter writer = context.getResponseWriter();
         String clientId = component.getClientId(context);
         Locale locale = context.getViewRoot().getLocale();
-        writer.writeText(new JSObject("RichFaces.Schedule", clientId, locale.getLanguage(),
+        writer.writeText(new JSObject("RichFaces.Schedule", clientId, locale.toString(),
                 getOptions(component),
                 DATE_RANGE_CHANGED_EVENT,
                 ITEM_SELECTED_EVENT,
@@ -134,6 +129,7 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
                 ITEM_RESIZE_EVENT,
                 VIEW_CHANGED_EVENT,
                 DATE_SELECTED_EVENT,
+                DATE_RANGE_SELECTED_EVENT,
                 createSubmitEventFunction(context, component)).toScript(),
                 null);
     }
@@ -190,6 +186,10 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         addOptionIfSet("minTime", schedule.getMinTime(), options);
         addOptionIfSet("maxTime", schedule.getMaxTime(), options);
         addOptionIfSet("editable", schedule.getEditable(), options);
+        addOptionIfSet("selectable", schedule.getSelectable(), options);
+        addOptionIfSet("selectHelper", schedule.getSelectHelper(), options);
+        addOptionIfSet("unselectAuto", schedule.getUnselectAuto(), options);
+        addOptionIfSet("unselectCancel", schedule.getUnselectCancel(), options);
         addOptionIfSet("disableDragging", schedule.getDisableDragging(), options);
         addOptionIfSet("disableResizing", schedule.getDisableResizing(), options);
         addOptionIfSet("dragRevertDuration", schedule.getDragRevertDuration(), options);
@@ -216,6 +216,7 @@ public abstract class ScheduleRendererBase extends AjaxComponentRendererBase {
         addOptionIfSet("onItemMouseout", schedule.getOnItemMouseout(), options);
         addOptionIfSet("onViewDisplay", schedule.getOnViewDisplay(), options);
         addOptionIfSet("onDateSelected", schedule.getOnDateSelected(), options);
+        addOptionIfSet("onDateRangeSelected", schedule.getOnDateRangeSelected(), options);
         if (schedule.getDate() != null) {
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(schedule.getDate());
--- a/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
View file @7f8bc29
+++ b/src/main/java/org/richfaces/renderkit/html/scripts/ScheduleMessages.java
View file @7f8bc29
 package org.richfaces.renderkit.html.scripts;
+import org.ajax4jsf.resource.ClientScript;
+import org.ajax4jsf.resource.ResourceContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.application.Application;
+import javax.faces.context.FacesContext;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import javax.faces.FactoryFinder;
-import javax.faces.context.ExternalContext;
-import javax.faces.context.FacesContext;
-import javax.faces.context.FacesContextFactory;
-import org.ajax4jsf.resource.InternetResourceBase;
-import org.ajax4jsf.resource.ResourceContext;
-public class ScheduleMessages extends InternetResourceBase {
+public class ScheduleMessages extends ClientScript {
+
+    public static final String BUNDLE_NAME = "org.richfaces.component.UIScheduleMessages";
+    private static final String MESSAGE_KEY_BASE = "org.richfaces.component.UISchedule.";
+    private static final Log log = LogFactory.getLog(ClientScript.class);
+//    private Locale recentLocale;
     @Override
     public InputStream getResourceAsStream(ResourceContext context) {
 //TODO how to access messages from here if user keeps them somewhere else?
-        String language = "pl";
-        Locale locale = new Locale(language);
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
-//TODO load default locale if specific is null
-        ResourceBundle bundle = ResourceBundle.getBundle("org.richfaces.component.scheduleMessages", locale, loader);
+        FacesContext facesContext = FacesContext.getCurrentInstance();
+        Application application = facesContext.getApplication();
+        Locale locale = application.getViewHandler().calculateLocale(facesContext);
+//        recentLocale = locale;
+        ResourceBundle applicationBundle = ResourceBundle.getBundle(application.getMessageBundle(), locale, loader);
+        ResourceBundle stockBundle = ResourceBundle.getBundle(BUNDLE_NAME, locale, loader);
+        String[] months = new String[]{"JANUARY", "FEBRUARY", "MARCH", "APRIL", "MAY", "JUNE", "JULY", "AUGUST", "SEPTEMBER", "OCTOBER", "NOVEMBER", "DECEMBER"};
+        String[] days = new String[]{"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY"};
         StringBuilder out = new StringBuilder();
-        out.append("RichFaces.Schedule.prototype.messages=jQuery.extend(RichFaces.Schedule.prototype.messages,{").append("'").append(locale).append("':{").append("monthNames:[");
-        String[] months = new String[]{"JANUARY","FEBRUARY"};
-        for (int i = 0; i < months.length; i++) {
-            out.append("'");
-//TODO Handle MissingResourceException
-//TODO Escape message strings
-            try {
-                out.append(escape(bundle.getString("org.richfaces.component.UISchedule.monthNames." + months[i])));
-            } catch (MissingResourceException e) {
-                out.append(escape(months[i]));
+        out.append("RichFaces.Schedule.prototype.messages=jQuery.extend(RichFaces.Schedule.prototype.messages,{").append("'").append(locale.toString()).append("':{");
+        out.append("allDayText:'").append(escape(getMessageFromBundle(MESSAGE_KEY_BASE + "allDay", applicationBundle, stockBundle))).append("',");
+        appendArray(out, applicationBundle, stockBundle, "monthNames", "monthNames", months);
+        out.append(",");
+        appendArray(out, applicationBundle, stockBundle, "monthNamesShort", "monthNamesShort", months);
+        out.append(",");
+        appendArray(out, applicationBundle, stockBundle, "dayNames", "dayNames", days);
+        out.append(",");
+        appendArray(out, applicationBundle, stockBundle, "dayNamesShort", "dayNamesShort", days);
+        out.append(",");
+        appendMap(out, applicationBundle, stockBundle, "buttonText", "buttonTexts", new String[]{"prev", "next", "prevYear", "nextYear", "today", "month", "day", "week"});
+        out.append("}").append("})");
+        try {
+//            TODO where to get encoding from? It should match properties file's encoding, but probably be converted to response encoding
+            return new ByteArrayInputStream(out.toString().getBytes(application.getViewHandler().calculateCharacterEncoding(facesContext)));
+        } catch (UnsupportedEncodingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void appendArray(StringBuilder out, ResourceBundle applicationBundle, ResourceBundle stockBundle, String jsPropertyName, String prefix, String[] keys) {
+        String key;
+        out.append(jsPropertyName).append(":[");
+        for (int i = 0; i < keys.length; i++) {
+            key = MESSAGE_KEY_BASE + prefix + "." + keys[i];
+            out.append("'").append(escape(getMessageFromBundle(key, applicationBundle, stockBundle))).append("'");
+            if (i + 1 < keys.length) {
+                out.append(",");
             }
-            out.append("'");
-            if (i + 1 < months.length) {
+        }
+        out.append("]");
+    }
+
+    private void appendMap(StringBuilder out, ResourceBundle applicationBundle, ResourceBundle stockBundle, String jsPropertyName, String prefix, String[] keys) {
+        String key;
+        out.append(jsPropertyName).append(":{");
+        for (int i = 0; i < keys.length; i++) {
+            key = MESSAGE_KEY_BASE + prefix + "." + keys[i];
+            out.append(keys[i]).append(":").append("'").append(escape(getMessageFromBundle(key, applicationBundle, stockBundle))).append("'");
+            if (i + 1 < keys.length) {
                 out.append(",");
             }
         }
-        out.append("]").append("}").append("})");
-        return new ByteArrayInputStream(out.toString().getBytes());
+        out.append("}");
+    }
+
+    private String getMessageFromBundle(String key, ResourceBundle applicationBundle, ResourceBundle stockBundle) {
+        try {
+            return applicationBundle.getString(key);
+        } catch (MissingResourceException e) {
+            try {
+                return stockBundle.getString(key);
+            } catch (MissingResourceException e1) {
+                if (log.isWarnEnabled()) {
+                    log.warn("Cannot find resource " + e1.getKey() + " in bundle " + e1.getClassName());
+                }
+                return "";
+            }
+        }
     }
     private String escape(String message) {
-        return message.replaceAll("'", "\\'");
+        return message.replaceAll("'", "\\\\'");
+    }
+
+    @Override
+    public String getJavaScript() {
+        return getClass().getCanonicalName();
+    }
+
+    @Override
+    public boolean requireFacesContext() {
+        return true;
     }
+//TODO if locale changes then recreate this resource
+//    @Override
+//    public boolean isCacheable(ResourceContext resourceContext) {
+//        if (resourceContext instanceof FacesResourceContext) {
+//            FacesContext facesContext = ((FacesResourceContext) resourceContext).getFacesContext();
+//            Locale locale = facesContext.getApplication().getViewHandler().calculateLocale(facesContext);
+
+    //            if (locale != null && !locale.equals(recentLocale)) {
+//                return false;
+//            }
+//        }
+//        return super.isCacheable(resourceContext);
+//    }
+    public boolean isCacheable(ResourceContext resourceContext) {
+        return false;
+    }
+
 }
--- a/src/main/resources/org/richfaces/component/UIScheduleMessages_en.properties 0 → 100644
View file @7f8bc29
+++ b/src/main/resources/org/richfaces/component/UIScheduleMessages_en.properties 0 → 100644
View file @7f8bc29
+org.richfaces.component.UISchedule.allDay=All day
+org.richfaces.component.UISchedule.monthNames.JANUARY=January
+org.richfaces.component.UISchedule.monthNames.FEBRUARY=Fabruary
+org.richfaces.component.UISchedule.monthNames.MARCH=March
+org.richfaces.component.UISchedule.monthNames.APRIL=April
+org.richfaces.component.UISchedule.monthNames.MAY=May
+org.richfaces.component.UISchedule.monthNames.JUNE=June
+org.richfaces.component.UISchedule.monthNames.JULY=July
+org.richfaces.component.UISchedule.monthNames.AUGUST=August
+org.richfaces.component.UISchedule.monthNames.SEPTEMBER=September
+org.richfaces.component.UISchedule.monthNames.OCTOBER=October
+org.richfaces.component.UISchedule.monthNames.NOVEMBER=November
+org.richfaces.component.UISchedule.monthNames.DECEMBER=December
+org.richfaces.component.UISchedule.monthNamesShort.JANUARY=Jan
+org.richfaces.component.UISchedule.monthNamesShort.FEBRUARY=Feb
+org.richfaces.component.UISchedule.monthNamesShort.MARCH=Mar
+org.richfaces.component.UISchedule.monthNamesShort.APRIL=Apr
+org.richfaces.component.UISchedule.monthNamesShort.MAY=May
+org.richfaces.component.UISchedule.monthNamesShort.JUNE=Jun
+org.richfaces.component.UISchedule.monthNamesShort.JULY=Jul
+org.richfaces.component.UISchedule.monthNamesShort.AUGUST=Aug
+org.richfaces.component.UISchedule.monthNamesShort.SEPTEMBER=Sep
+org.richfaces.component.UISchedule.monthNamesShort.OCTOBER=Oct
+org.richfaces.component.UISchedule.monthNamesShort.NOVEMBER=Nov
+org.richfaces.component.UISchedule.monthNamesShort.DECEMBER=Dec
+org.richfaces.component.UISchedule.dayNames.SUNDAY=Sunday
+org.richfaces.component.UISchedule.dayNames.MONDAY=Monday
+org.richfaces.component.UISchedule.dayNames.TUESDAY=Tuesday
+org.richfaces.component.UISchedule.dayNames.WEDNESDAY=Wednesday
+org.richfaces.component.UISchedule.dayNames.THURSDAY=Thursday
+org.richfaces.component.UISchedule.dayNames.FRIDAY=Friday
+org.richfaces.component.UISchedule.dayNames.SATURDAY=Saturday
+org.richfaces.component.UISchedule.dayNamesShort.SUNDAY=Sun
+org.richfaces.component.UISchedule.dayNamesShort.MONDAY=Mon
+org.richfaces.component.UISchedule.dayNamesShort.TUESDAY=Tue
+org.richfaces.component.UISchedule.dayNamesShort.WEDNESDAY=Wed
+org.richfaces.component.UISchedule.dayNamesShort.THURSDAY=Thu
+org.richfaces.component.UISchedule.dayNamesShort.FRIDAY=Fri
+org.richfaces.component.UISchedule.dayNamesShort.SATURDAY=Sat
+org.richfaces.component.UISchedule.buttonTexts.prev=&nbsp;&#9668;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.next=&nbsp;&#9658;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.prevYear=&nbsp;&lt;&lt;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.nextYear=&nbsp;&gt;&gt;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.today=today
+org.richfaces.component.UISchedule.buttonTexts.month=month
+org.richfaces.component.UISchedule.buttonTexts.week=week
+org.richfaces.component.UISchedule.buttonTexts.day=day
--- a/src/main/resources/org/richfaces/component/UIScheduleMessages_pl.properties 0 → 100644
View file @7f8bc29
+++ b/src/main/resources/org/richfaces/component/UIScheduleMessages_pl.properties 0 → 100644
View file @7f8bc29
+org.richfaces.component.UISchedule.allDay=Ca\u0142y dzie\u0144
+org.richfaces.component.UISchedule.monthNames.JANUARY=Stycze\u0144
+org.richfaces.component.UISchedule.monthNames.FEBRUARY=Luty
+org.richfaces.component.UISchedule.monthNames.MARCH=Marzec
+org.richfaces.component.UISchedule.monthNames.APRIL=Kwiecie\u0144
+org.richfaces.component.UISchedule.monthNames.MAY=Maj
+org.richfaces.component.UISchedule.monthNames.JUNE=Czerwiec
+org.richfaces.component.UISchedule.monthNames.JULY=Lipiec
+org.richfaces.component.UISchedule.monthNames.AUGUST=Sierpie\u0144
+org.richfaces.component.UISchedule.monthNames.SEPTEMBER=Wrzesie\u0144
+org.richfaces.component.UISchedule.monthNames.OCTOBER=Pa\u017Adziernik
+org.richfaces.component.UISchedule.monthNames.NOVEMBER=Listopad
+org.richfaces.component.UISchedule.monthNames.DECEMBER=Grudzie\u0144
+org.richfaces.component.UISchedule.monthNamesShort.JANUARY=Sty
+org.richfaces.component.UISchedule.monthNamesShort.FEBRUARY=Lut
+org.richfaces.component.UISchedule.monthNamesShort.MARCH=Mar
+org.richfaces.component.UISchedule.monthNamesShort.APRIL=Kwi
+org.richfaces.component.UISchedule.monthNamesShort.MAY=Maj
+org.richfaces.component.UISchedule.monthNamesShort.JUNE=Cze
+org.richfaces.component.UISchedule.monthNamesShort.JULY=Lip
+org.richfaces.component.UISchedule.monthNamesShort.AUGUST=Sie
+org.richfaces.component.UISchedule.monthNamesShort.SEPTEMBER=Wrz
+org.richfaces.component.UISchedule.monthNamesShort.OCTOBER=Pa\u017A
+org.richfaces.component.UISchedule.monthNamesShort.NOVEMBER=Lis
+org.richfaces.component.UISchedule.monthNamesShort.DECEMBER=Gru
+org.richfaces.component.UISchedule.dayNames.SUNDAY=Niedziela
+org.richfaces.component.UISchedule.dayNames.MONDAY=Poniedzia\u0142ek
+org.richfaces.component.UISchedule.dayNames.TUESDAY=Wtorek
+org.richfaces.component.UISchedule.dayNames.WEDNESDAY=\u015Aroda
+org.richfaces.component.UISchedule.dayNames.THURSDAY=Czwartek
+org.richfaces.component.UISchedule.dayNames.FRIDAY=Pi\u0105tek
+org.richfaces.component.UISchedule.dayNames.SATURDAY=Sobota
+org.richfaces.component.UISchedule.dayNamesShort.SUNDAY=Nie
+org.richfaces.component.UISchedule.dayNamesShort.MONDAY=Pon
+org.richfaces.component.UISchedule.dayNamesShort.TUESDAY=Wto
+org.richfaces.component.UISchedule.dayNamesShort.WEDNESDAY=\u015Aro
+org.richfaces.component.UISchedule.dayNamesShort.THURSDAY=Czw
+org.richfaces.component.UISchedule.dayNamesShort.FRIDAY=Pi\u0105
+org.richfaces.component.UISchedule.dayNamesShort.SATURDAY=Sob
+org.richfaces.component.UISchedule.buttonTexts.prev=&nbsp;&#9668;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.next=&nbsp;&#9658;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.prevYear=&nbsp;&lt;&lt;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.nextYear=&nbsp;&gt;&gt;&nbsp;
+org.richfaces.component.UISchedule.buttonTexts.today=Dzi\u015B
+org.richfaces.component.UISchedule.buttonTexts.month=Miesi\u0105c
+org.richfaces.component.UISchedule.buttonTexts.week=Tydzie\u0144
+org.richfaces.component.UISchedule.buttonTexts.day=Dzie\u0144
--- a/src/main/resources/org/richfaces/component/scheduleMessages.properties deleted 100644 → 0
View file @327ce89
+++ b/src/main/resources/org/richfaces/component/scheduleMessages.properties deleted 100644 → 0
View file @327ce89
-org.richfaces.component.UISchedule.monthNames.JANUARY=January
--- a/src/main/resources/org/richfaces/renderkit/html/scripts/fullcalendar.js
View file @7f8bc29
+++ b/src/main/resources/org/richfaces/renderkit/html/scripts/fullcalendar.js
View file @7f8bc29
--- a/src/main/resources/org/richfaces/renderkit/html/scripts/richfaces.schedule.js
View file @7f8bc29
+++ b/src/main/resources/org/richfaces/renderkit/html/scripts/richfaces.schedule.js
View file @7f8bc29
@@ -4,14 +4,15 @@ window.RichFaces.Schedule = (function() {
         return Math.round(date.getTime() / 1000);
     };
-    return function(id, locale, options, loadItemsEventName, itemSelectedEventName, itemMovedEventName, itemResizedEventName, viewChangedEventName, daySelectedEventName, submitEventFunction) {
+    return function(id, locale, options, loadItemsEventName, itemSelectedEventName, itemMovedEventName, itemResizedEventName, viewChangedEventName, daySelectedEventName, dateRangeSelectedEventName, submitEventFunction) {
         this.id = id;
+        var component;
         /**
          * submitEventFunction should have following params:
          *  event,view,eventType,itemId,startDate,endDate,dayDelta,minuteDelta,allDay,callback
          */
         this.submitEventFunction = submitEventFunction;
-        options = jQuery.extend(options, this.messages[locale]);
+        options = jQuery.extend(this.messages[locale], options);
         var elt = document.getElementById(id);
         if (!elt) {
             throw "No element with id '" + id + "' found.";
@@ -190,6 +191,30 @@ window.RichFaces.Schedule = (function() {
             }
             selectedView = view;
         };
+        var onDateRangeSelected = function(startDate, endDate, allDay) {
+            if (!component.fullCalendar('option', 'selectable')) {
+                return;
+            }
+            if (options.onDateRangeSelected != null) {
+                var result = eval("(function(){" + options.onDateRangeSelected + "})()");
+                if (result != null) {
+                    return;
+                }
+            }
+            if (_this.submitEventFunction != null) {
+                _this.submitEventFunction({},
+                        null,
+                        dateRangeSelectedEventName,
+                        null, formatDateParam(startDate), formatDateParam(endDate), null, null, allDay,
+                        function(request, event, data) {
+                            component.fullCalendar('refetchEvents');
+                            component.fullCalendar('unselect');
+                        }
+                        );
+            } else {
+                component.fullCalendar('unselect');
+            }
+        };
         options = jQuery.extend({
             events: fillCalendarFunction,
             eventDragStart: itemDragStart,
@@ -202,11 +227,13 @@ window.RichFaces.Schedule = (function() {
             eventMouseover: itemMouseover,
             eventMouseout: itemMouseout,
             viewDisplay: viewDisplay,
-            dayClick: dayClick
+            dayClick: dayClick,
+            select: onDateRangeSelected
         }, options);
         jQuery(document).ready(function() {
-            jQuery(elt).fullCalendar(options);
+            component = jQuery(elt).fullCalendar(options);
         });
     };
 }());
+window.RichFaces.Schedule.prototype.messages = {};
--- a/src/main/templates/org/richfaces/htmlSchedule.jspx
View file @7f8bc29
+++ b/src/main/templates/org/richfaces/htmlSchedule.jspx
View file @7f8bc29
 <?xml version="1.0" encoding="UTF-8"?>
 <f:root
-    xmlns:f="http://jsf.exadel.com/template"
-    xmlns:vcp=" http://jsf.exadel.com/vcp"
-    xmlns:ui=" http://jsf.exadel.com/ui"
-    xmlns:x=" http://jsf.exadel.com/vcp"
-    xmlns:u="http://jsf.exadel.com/util"
-    xmlns:h="http://jsf.exadel.com/header"
-    xmlns:jsp="http://java.sun.com/JSP/Page"
-    xmlns:c="http://java.sun.com/jstl/core"
-    class="org.richfaces.renderkit.html.ScheduleRenderer"
-    baseclass="org.richfaces.renderkit.ScheduleRendererBase"
-    component="org.richfaces.component.UISchedule">
+        xmlns:f="http://jsf.exadel.com/template"
+        xmlns:vcp=" http://jsf.exadel.com/vcp"
+        xmlns:ui=" http://jsf.exadel.com/ui"
+        xmlns:x=" http://jsf.exadel.com/vcp"
+        xmlns:u="http://jsf.exadel.com/util"
+        xmlns:h="http://jsf.exadel.com/header"
+        xmlns:jsp="http://java.sun.com/JSP/Page"
+        xmlns:c="http://java.sun.com/jstl/core"
+        class="org.richfaces.renderkit.html.ScheduleRenderer"
+        baseclass="org.richfaces.renderkit.ScheduleRendererBase"
+        component="org.richfaces.component.UISchedule">
     <f:clientid var="clientId"/>
     <h:styles>/org/richfaces/renderkit/html/css/fullcalendar.css</h:styles>
     <h:scripts>org.ajax4jsf.javascript.AjaxScript,
@@ -21,18 +21,18 @@
         /org/richfaces/renderkit/html/scripts/ui.draggable.js,
         /org/richfaces/renderkit/html/scripts/ui.resizable.js,
         /org/richfaces/renderkit/html/scripts/fullcalendar.js,
-        /org/richfaces/renderkit/html/scripts/richfaces.schedule.js
+        /org/richfaces/renderkit/html/scripts/richfaces.schedule.js,
+        org.richfaces.renderkit.html.scripts.ScheduleMessages
     </h:scripts>
-    <jsp:directive.page import="org.ajax4jsf.renderkit.AjaxRendererUtils"/>
-    <jsp:directive.page import="org.ajax4jsf.javascript.JSFunction"/>
-    <jsp:directive.page import="org.ajax4jsf.javascript.JSLiteral"/>
-    <jsp:directive.page import="org.ajax4jsf.renderkit.RendererUtils.HTML"/>
     <jsp:scriptlet>
-        <![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>
+        <![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context, component);]]>
     </jsp:scriptlet>
-    <div id="#{clientId}" class="rich-schedule #{component.attributes['styleClass']}" x:passThruWithExclusions="value,name,type,id"></div>
+    <div id="#{clientId}" class="rich-schedule #{component.attributes['styleClass']}"
+         x:passThruWithExclusions="value,name,type,id"></div>
     <input type="hidden" name="#{clientId}" id="#{clientId}"/>
     <script type="text/javascript">
-        <f:call name="writeInitFunction"/>
+        <
+        f:call
+        name = "writeInitFunction" / >
     </script>
 </f:root>