Merge remote branch 'upstream/master'

yui · Sep 21, 2011 · 65ffb29 · 65ffb29
2 parents 9147dc1 + 8602286
commit 65ffb29
Show file tree

Hide file tree

Showing 9 changed files with 290 additions and 13 deletions.
diff --git a/build/calendar-base/calendar-base-debug.js b/build/calendar-base/calendar-base-debug.js
@@ -88,7 +88,7 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
    * @type String
    * @private
    */
-  _calendarId : Y.guid(CALENDAR),
+  _calendarId : null,
 
   /**
    * The hash map of selected dates, populated with
@@ -134,10 +134,17 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
 
   /**
    * Designated initializer
+   * Initializes instance-level properties of
+   * calendar.
    *
    * @method initializer
    */  
   initializer : function () {
+    this._paneProperties = {};
+    this._calendarId = Y.guid('calendar');
+    this._selectedDates = {};
+    this._rules = {};
+    this.storedDateCells = {};
   },
 
   /**
@@ -589,6 +596,13 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      * @private
      */
     _fireSelectionChange : function () {
+
+   /**
+     * Fired when the set of selected dates changes. Contains a payload with
+     * a `newSelection` property with an array of selected dates.
+     *
+     * @event selectionChange
+     */
       this.fire("selectionChange", {newSelection: this._getSelectedDatesList()});
     },
 
@@ -1493,7 +1507,8 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      *
      * @attribute date
      * @type Date
-     * @default Today's date as set on the user's computer.
+     * @default The first of the month containing today's date, as
+     * set on the end user's system.
      */
     date: {
       value: new Date(),
@@ -1615,4 +1630,4 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
 });
 
 
-}, '@VERSION@' ,{lang:['en', 'ja', 'ru'], requires:['widget', 'substitute', 'datatype-date', 'datatype-date-math', 'cssgrids']});
+}, '@VERSION@' ,{requires:['widget', 'substitute', 'datatype-date', 'datatype-date-math', 'cssgrids'], lang:['en', 'ja', 'ru']});
diff --git a/build/calendar-base/calendar-base-min.js b/build/calendar-base/calendar-base-min.js
diff --git a/build/calendar-base/calendar-base.js b/build/calendar-base/calendar-base.js
@@ -88,7 +88,7 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
    * @type String
    * @private
    */
-  _calendarId : Y.guid(CALENDAR),
+  _calendarId : null,
 
   /**
    * The hash map of selected dates, populated with
@@ -134,10 +134,17 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
 
   /**
    * Designated initializer
+   * Initializes instance-level properties of
+   * calendar.
    *
    * @method initializer
    */  
   initializer : function () {
+    this._paneProperties = {};
+    this._calendarId = Y.guid('calendar');
+    this._selectedDates = {};
+    this._rules = {};
+    this.storedDateCells = {};
   },
 
   /**
@@ -589,6 +596,13 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      * @private
      */
     _fireSelectionChange : function () {
+
+   /**
+     * Fired when the set of selected dates changes. Contains a payload with
+     * a `newSelection` property with an array of selected dates.
+     *
+     * @event selectionChange
+     */
       this.fire("selectionChange", {newSelection: this._getSelectedDatesList()});
     },
 
@@ -1493,7 +1507,8 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      *
      * @attribute date
      * @type Date
-     * @default Today's date as set on the user's computer.
+     * @default The first of the month containing today's date, as
+     * set on the end user's system.
      */
     date: {
       value: new Date(),
@@ -1615,4 +1630,4 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
 });
 
 
-}, '@VERSION@' ,{lang:['en', 'ja', 'ru'], requires:['widget', 'substitute', 'datatype-date', 'datatype-date-math', 'cssgrids']});
+}, '@VERSION@' ,{requires:['widget', 'substitute', 'datatype-date', 'datatype-date-math', 'cssgrids'], lang:['en', 'ja', 'ru']});
diff --git a/build/calendar/calendar-debug.js b/build/calendar/calendar-debug.js
@@ -335,4 +335,4 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
 });
 
 
-}, '@VERSION@' ,{lang:['en', 'ja', 'ru'], requires:['calendar-base', 'calendarnavigator']});
+}, '@VERSION@' ,{requires:['calendar-base', 'calendarnavigator'], lang:['en', 'ja', 'ru']});
diff --git a/build/calendar/calendar-min.js b/build/calendar/calendar-min.js
diff --git a/build/calendar/calendar.js b/build/calendar/calendar.js
@@ -335,4 +335,4 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
 });
 
 
-}, '@VERSION@' ,{lang:['en', 'ja', 'ru'], requires:['calendar-base', 'calendarnavigator']});
+}, '@VERSION@' ,{requires:['calendar-base', 'calendarnavigator'], lang:['en', 'ja', 'ru']});
diff --git a/src/calendar/js/calendar-base.js b/src/calendar/js/calendar-base.js
@@ -594,6 +594,13 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      * @private
      */
     _fireSelectionChange : function () {
+
+   /**
+     * Fired when the set of selected dates changes. Contains a payload with
+     * a `newSelection` property with an array of selected dates.
+     *
+     * @event selectionChange
+     */
       this.fire("selectionChange", {newSelection: this._getSelectedDatesList()});
     },
 
@@ -1498,7 +1505,8 @@ Y.CalendarBase = Y.extend( CalendarBase, Y.Widget, {
      *
      * @attribute date
      * @type Date
-     * @default Today's date as set on the user's computer.
+     * @default The first of the month containing today's date, as
+     * set on the end user's system.
      */
     date: {
       value: new Date(),