Author: mgrigorov
Date: Mon Nov 21 09:03:44 2011
New Revision: 1204405
URL: http://svn.apache.org/viewvc?rev=1204405&view=rev
Log:
WICKET-4249 Use better namespacing for Wicket.DateTime initialization scripts
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java?rev=1204405&r1=1204404&r2=1204405&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
Mon Nov 21 09:03:44 2011
@@ -213,6 +213,8 @@ public class DatePicker extends Behavior
@Override
public void renderHead(Component component, IHeaderResponse response)
{
+ super.renderHead(component, response);
+
if (includeYUILibraries())
{
YuiLib.load(response);
@@ -298,7 +300,7 @@ public class DatePicker extends Behavior
Map<String, Object> variables = new HashMap<String, Object>();
variables.put("basePath",
Strings.stripJSessionId(RequestCycle.get().urlFor(YUI,
null).toString()) + "/");
- variables.put("wicketDatePath",
RequestCycle.get().urlFor(WICKET_DATE, null));
+ variables.put("Wicket.DateTimeInit.DatePath",
RequestCycle.get().urlFor(WICKET_DATE, null));
if (Application.get().usesDevelopmentConfig())
{
@@ -562,7 +564,7 @@ public class DatePicker extends Behavior
Map<String, Object> initVariables)
{
Locale locale = getLocale();
- String key = "wicketCalendarI18n[\"" + locale.toString() +
"\"]";
+ String key = "Wicket.DateTimeInit.CalendarI18n[\"" +
locale.toString() + "\"]";
initVariables.put("i18n", key);
if (response.wasRendered(key))
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js?rev=1204405&r1=1204404&r2=1204405&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.js
Mon Nov 21 09:03:44 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-wicketCalendarAdd(function() {
+Wicket.DateTimeInit.CalendarAdd(function() {
Wicket.DateTime.init2("${widgetId}", "${componentId}", ${calendarInit},
"${datePattern}",
${alignWithIcon}, ${fireChangeEvent}, ${hideOnSelect},
${showOnFieldClick}, ${i18n}, ${autoHide});
${additionalJavascript}
Modified:
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js?rev=1204405&r1=1204404&r2=1204405&view=diff
==============================================================================
---
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
(original)
+++
wicket/trunk/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePickerInit.js
Mon Nov 21 09:03:44 2011
@@ -14,37 +14,44 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-wicketCalendarInits = [];
-wicketCalendarInitFinished = false;
-wicketCalendarI18n = {};
-wicketCalendarAdd = function(initFn) {
- if (wicketCalendarInitFinished) {
+if (typeof(Wicket) === 'undefined') {
+ window.Wicket = {};
+}
+if (typeof(Wicket.DateTimeInit) === 'undefined') {
+ Wicket.DateTimeInit = {};
+}
+
+Wicket.DateTimeInit.CalendarInits = [];
+Wicket.DateTimeInit.CalendarInitFinished = false;
+Wicket.DateTimeInit.CalendarI18n = {};
+Wicket.DateTimeInit.CalendarAdd = function(initFn) {
+ if (Wicket.DateTimeInit.CalendarInitFinished) {
// when a DatePicker is added via ajax, the loader is already
finished, so
// we call the init function directly.
initFn();
} else {
// when page is rendered, all calendar components will be
initialized after
// the required js libraries have been loaded.
- wicketCalendarInits.push(initFn);
+ Wicket.DateTimeInit.CalendarInits.push(initFn);
}
};
-var wicketYuiLoader = new YAHOO.util.YUILoader({
+Wicket.DateTimeInit.YuiLoader = new YAHOO.util.YUILoader({
base: "${basePath}",
${filter}
allowRollup: ${allowRollup},
require: ["wicket-date"],
onSuccess: function() {
- wicketCalendarInitFinished = true;
- while (wicketCalendarInits.length > 0) {
- wicketCalendarInits.pop()();
+ Wicket.DateTimeInit.CalendarInitFinished = true;
+ while (Wicket.DateTimeInit.CalendarInits.length > 0) {
+ Wicket.DateTimeInit.CalendarInits.pop()();
}
}
});
-wicketYuiLoader.addModule({
+Wicket.DateTimeInit.YuiLoader.addModule({
name: "wicket-date",
type: "js",
requires: ["calendar"],
- fullpath: "${wicketDatePath}"
+ fullpath: "${Wicket.DateTimeInit.DatePath}"
});
-wicketYuiLoader.insert();
+Wicket.DateTimeInit.YuiLoader.insert();
