You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pe...@apache.org on 2016/09/06 00:06:09 UTC
wicket git commit: WICKET-5972 no close label for Yahoo date picker
by default
Repository: wicket
Updated Branches:
refs/heads/wicket-6.x 635b21c6e -> bef134d31
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/bef134d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bef134d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bef134d3
Branch: refs/heads/wicket-6.x
Commit: bef134d31b1772ac6d9bb6aec5a513257b49bdf6
Parents: 635b21c
Author: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Authored: Mon Sep 5 21:04:01 2016 -0300
Committer: Pedro Henrique Oliveira dos Santos <pe...@apache.org>
Committed: Mon Sep 5 21:04:01 2016 -0300
----------------------------------------------------------------------
.../extensions/yui/calendar/DatePicker.java | 25 ++++++++++++++++++++
.../extensions/yui/calendar/DatePicker.js | 2 +-
.../extensions/yui/calendar/wicket-date.js | 7 ++++--
3 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bef134d3/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 01d0155..ec0877d 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)
@@ -762,6 +768,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/bef134d3/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/bef134d3/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
});
};