Repository: wicket Updated Branches: refs/heads/master f2a3a3db1 -> 1f801ba7e
WICKET-5972 no close label for Yahoo date picker by default Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1f801ba7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1f801ba7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1f801ba7 Branch: refs/heads/master Commit: 1f801ba7e829d4094b964962fee9b79f090b5e1a Parents: f2a3a3d Author: Pedro Henrique Oliveira dos Santos <[email protected]> Authored: Mon Sep 5 21:04:01 2016 -0300 Committer: Pedro Henrique Oliveira dos Santos <[email protected]> Committed: Fri Sep 23 21:26:15 2016 -0300 ---------------------------------------------------------------------- .../extensions/yui/calendar/DatePicker.java | 25 ++++++++++++++++++++ .../extensions/yui/calendar/DatePicker.js | 2 +- .../extensions/yui/calendar/wicket-date.js | 7 ++++-- .../yui/calendar/DatesPage1_ExpectedResult.html | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/1f801ba7/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java index e83a9d5..6b09e7a 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java @@ -129,6 +129,11 @@ public class DatePicker extends Behavior private boolean autoHide = false; /** + * The string to use for the close button label. + */ + private String closeLabel = ""; + + /** * Construct. */ public DatePicker() @@ -234,6 +239,7 @@ public class DatePicker extends Behavior variables.put("hideOnSelect", hideOnSelect()); variables.put("showOnFieldClick", showOnFieldClick()); variables.put("autoHide", autoHide()); + variables.put("closeLabel", closeLabel()); String script = getAdditionalJavaScript(); if (script != null) @@ -760,6 +766,25 @@ public class DatePicker extends Behavior } /** + * The string to use for the close button label. + * + * @return label + */ + protected String closeLabel() + { + return closeLabel; + } + + /** + * @param closeLabel + * The string to use for the close button label. + */ + public void setCloseLabel(String closeLabel) + { + this.closeLabel = closeLabel; + } + + /** * Indicates whether the calendar should be rendered after it has been loaded. * * @return <code>true</code> if the calendar should be rendered after it has been loaded.<br/> http://git-wip-us.apache.org/repos/asf/wicket/blob/1f801ba7/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js index e68d270..e40e0c2 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js @@ -16,6 +16,6 @@ */ Wicket.DateTimeInit.CalendarAdd(function() { Wicket.DateTime.init2("${widgetId}", "${componentId}", ${calendarInit}, "${datePattern}", - ${alignWithIcon}, ${fireChangeEvent}, ${hideOnSelect}, ${showOnFieldClick}, ${i18n}, ${autoHide}); + ${alignWithIcon}, ${fireChangeEvent}, ${hideOnSelect}, ${showOnFieldClick}, ${i18n}, ${autoHide}, "${closeLabel}"); ${additionalJavascript} }); http://git-wip-us.apache.org/repos/asf/wicket/blob/1f801ba7/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js index b4c1532..9a84fc3 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/wicket-date.js @@ -275,6 +275,8 @@ YAHOO.util.Event.addListener(cfg.widgetId, "click", showCalendar, YAHOO.wicket[cfg.dpJs], true); } + YAHOO.wicket[cfg.dpJs].cfg.setProperty(YAHOO.widget.Calendar.DEFAULT_CONFIG.STRINGS.key, {"close": cfg.closeLabel}); + function selectHandler(type, args, cal) { YAHOO.util.Dom.get(cfg.componentId).value = Wicket.DateTime.substituteDate(cfg, args[0][0]); if (cal.isVisible()) { @@ -398,7 +400,7 @@ // init method variant that needs less character to invoke Wicket.DateTime.init2 = function(widgetId, componentId, calendarInit, datePattern, - alignWithIcon, fireChangeEvent, hideOnSelect, showOnFieldClick, i18n, autoHide) { + alignWithIcon, fireChangeEvent, hideOnSelect, showOnFieldClick, i18n, autoHide, closeLabel) { calendarInit.MONTHS_SHORT = i18n.MONTHS_SHORT; calendarInit.MONTHS_LONG = i18n.MONTHS_LONG; calendarInit.WEEKDAYS_MEDIUM = i18n.WEEKDAYS_MEDIUM; @@ -416,7 +418,8 @@ fireChangeEvent: fireChangeEvent, hideOnSelect: hideOnSelect, showOnFieldClick: showOnFieldClick, - autoHide: autoHide + autoHide: autoHide, + closeLabel: closeLabel }); }; http://git-wip-us.apache.org/repos/asf/wicket/blob/1f801ba7/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html ---------------------------------------------------------------------- diff --git a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html index 29e47ac..3d867e5 100644 --- a/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html +++ b/wicket-datetime/src/test/java/org/apache/wicket/extensions/yui/calendar/DatesPage1_ExpectedResult.html @@ -95,7 +95,7 @@ Wicket.DateTimeInit.CalendarI18n["it"]={MONTHS_SHORT:["gen","feb","mar","apr","m */ Wicket.DateTimeInit.CalendarAdd(function() { Wicket.DateTime.init2("dateTextField1", "dateTextField1", {close:true,selected:"xx/xx/xxxx",pagedate:"xx/xxxx"}, "dd/MM/yy", - true, true, true, false, Wicket.DateTimeInit.CalendarI18n["it"], false); + true, true, true, false, Wicket.DateTimeInit.CalendarI18n["it"], false, ""); }); ;
