Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Sanitize connectors for PopupDateField and DateField. (#17090)
Change-Id: I667796430eeaa0ddd8142b0c229fe133cd30cd49
- Loading branch information
Showing
5 changed files
with
271 additions
and
201 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
219 changes: 219 additions & 0 deletions
219
client/src/com/vaadin/client/ui/datefield/DateFieldConnector.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| /* | ||
| * Copyright 2000-2014 Vaadin Ltd. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
|
|
||
| package com.vaadin.client.ui.datefield; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| import com.google.gwt.event.logical.shared.CloseEvent; | ||
| import com.google.gwt.event.logical.shared.CloseHandler; | ||
| import com.google.gwt.user.client.ui.PopupPanel; | ||
| import com.vaadin.client.ApplicationConnection; | ||
| import com.vaadin.client.DateTimeService; | ||
| import com.vaadin.client.UIDL; | ||
| import com.vaadin.client.communication.StateChangeEvent; | ||
| import com.vaadin.client.ui.VCalendarPanel.FocusChangeListener; | ||
| import com.vaadin.client.ui.VCalendarPanel.TimeChangeListener; | ||
| import com.vaadin.client.ui.VPopupCalendar; | ||
| import com.vaadin.shared.ui.Connect; | ||
| import com.vaadin.shared.ui.datefield.PopupDateFieldState; | ||
| import com.vaadin.shared.ui.datefield.Resolution; | ||
| import com.vaadin.ui.DateField; | ||
| import com.vaadin.ui.PopupDateField; | ||
|
|
||
| @Connect(DateField.class) | ||
| public class DateFieldConnector extends TextualDateConnector { | ||
|
|
||
| /* | ||
| * (non-Javadoc) | ||
| * | ||
| * @see com.vaadin.client.ui.AbstractConnector#init() | ||
| */ | ||
| @Override | ||
| protected void init() { | ||
| getWidget().popup.addCloseHandler(new CloseHandler<PopupPanel>() { | ||
|
|
||
| @Override | ||
| public void onClose(CloseEvent<PopupPanel> event) { | ||
| /* | ||
| * FIXME This is a hack so we do not have to rewrite half of the | ||
| * datefield so values are not sent while selecting a date | ||
| * (#6252). | ||
| * | ||
| * The datefield will now only set the date UIDL variables while | ||
| * the user is selecting year/month/date/time and not send them | ||
| * directly. Only when the user closes the popup (by clicking on | ||
| * a day/enter/clicking outside of popup) then the new value is | ||
| * communicated to the server. | ||
| */ | ||
| if (getWidget().isImmediate()) { | ||
| getConnection().sendPendingVariableChanges(); | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| /* | ||
| * (non-Javadoc) | ||
| * | ||
| * @see com.vaadin.client.ui.VTextualDate#updateFromUIDL(com.vaadin | ||
| * .client.UIDL, com.vaadin.client.ApplicationConnection) | ||
| */ | ||
| @Override | ||
| @SuppressWarnings("deprecation") | ||
| public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { | ||
|
|
||
| String oldLocale = getWidget().getCurrentLocale(); | ||
|
|
||
| getWidget().parsable = uidl.getBooleanAttribute("parsable"); | ||
|
|
||
| super.updateFromUIDL(uidl, client); | ||
|
|
||
| getWidget().calendar.setDateTimeService(getWidget() | ||
| .getDateTimeService()); | ||
| getWidget().calendar.setShowISOWeekNumbers(getWidget() | ||
| .isShowISOWeekNumbers()); | ||
| if (getWidget().calendar.getResolution() != getWidget() | ||
| .getCurrentResolution()) { | ||
| boolean hasSelectedDate = false; | ||
| getWidget().calendar.setResolution(getWidget() | ||
| .getCurrentResolution()); | ||
| if (getWidget().calendar.getDate() != null | ||
| && getWidget().getCurrentDate() != null) { | ||
| hasSelectedDate = true; | ||
| getWidget().calendar.setDate((Date) getWidget() | ||
| .getCurrentDate().clone()); | ||
| } | ||
| // force re-render when changing resolution only | ||
| getWidget().calendar.renderCalendar(hasSelectedDate); | ||
| } | ||
|
|
||
| // Force re-render of calendar if locale has changed (#12153) | ||
| if (!getWidget().getCurrentLocale().equals(oldLocale)) { | ||
| getWidget().calendar.renderCalendar(); | ||
| } | ||
|
|
||
| if (getWidget().getCurrentResolution().getCalendarField() <= Resolution.MONTH | ||
| .getCalendarField()) { | ||
| getWidget().calendar | ||
| .setFocusChangeListener(new FocusChangeListener() { | ||
| @Override | ||
| public void focusChanged(Date date) { | ||
|
|
||
| getWidget().updateValue(date); | ||
| getWidget().buildDate(); | ||
| Date date2 = getWidget().calendar.getDate(); | ||
| date2.setYear(date.getYear()); | ||
| date2.setMonth(date.getMonth()); | ||
| } | ||
| }); | ||
| } else { | ||
| getWidget().calendar.setFocusChangeListener(null); | ||
| } | ||
|
|
||
| if (getWidget().getCurrentResolution().getCalendarField() > Resolution.DAY | ||
| .getCalendarField()) { | ||
| getWidget().calendar | ||
| .setTimeChangeListener(new TimeChangeListener() { | ||
| @Override | ||
| public void changed(int hour, int min, int sec, int msec) { | ||
| Date d = getWidget().getDate(); | ||
| if (d == null) { | ||
| // date currently null, use the value from | ||
| // calendarPanel | ||
| // (~ client time at the init of the widget) | ||
| d = (Date) getWidget().calendar.getDate() | ||
| .clone(); | ||
| } | ||
| d.setHours(hour); | ||
| d.setMinutes(min); | ||
| d.setSeconds(sec); | ||
| DateTimeService.setMilliseconds(d, msec); | ||
|
|
||
| // Always update time changes to the server | ||
| getWidget().updateValue(d); | ||
|
|
||
| // Update text field | ||
| getWidget().buildDate(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| if (getWidget().isReadonly()) { | ||
| getWidget().calendarToggle.addStyleName(VPopupCalendar.CLASSNAME | ||
| + "-button-readonly"); | ||
| } else { | ||
| getWidget().calendarToggle.removeStyleName(VPopupCalendar.CLASSNAME | ||
| + "-button-readonly"); | ||
| } | ||
|
|
||
| getWidget().setDescriptionForAssistiveDevices( | ||
| getState().descriptionForAssistiveDevices); | ||
|
|
||
| getWidget().setTextFieldTabIndex(); | ||
| } | ||
|
|
||
| @Override | ||
| public VPopupCalendar getWidget() { | ||
| return (VPopupCalendar) super.getWidget(); | ||
| } | ||
|
|
||
| @Override | ||
| public PopupDateFieldState getState() { | ||
| return (PopupDateFieldState) super.getState(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onStateChanged(StateChangeEvent stateChangeEvent) { | ||
| super.onStateChanged(stateChangeEvent); | ||
| getWidget().setTextFieldEnabled(getState().textFieldEnabled); | ||
| getWidget().setRangeStart(nullSafeDateClone(getState().rangeStart)); | ||
| getWidget().setRangeEnd(nullSafeDateClone(getState().rangeEnd)); | ||
| } | ||
|
|
||
| private Date nullSafeDateClone(Date date) { | ||
| if (date == null) { | ||
| return null; | ||
| } else { | ||
| return (Date) date.clone(); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected void setWidgetStyleName(String styleName, boolean add) { | ||
| super.setWidgetStyleName(styleName, add); | ||
|
|
||
| // update the style change to popup calendar widget | ||
| getWidget().popup.setStyleName(styleName, add); | ||
| } | ||
|
|
||
| @Override | ||
| protected void setWidgetStyleNameWithPrefix(String prefix, | ||
| String styleName, boolean add) { | ||
| super.setWidgetStyleNameWithPrefix(prefix, styleName, add); | ||
|
|
||
| // update the style change to popup calendar widget with the correct | ||
| // prefix | ||
| if (!styleName.startsWith("-")) { | ||
| getWidget().popup.setStyleName(getWidget().getStylePrimaryName() | ||
| + "-popup-" + styleName, add); | ||
| } else { | ||
| getWidget().popup.setStyleName(getWidget().getStylePrimaryName() | ||
| + "-popup" + styleName, add); | ||
| } | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.