Merge branch 'master' of yuisource.corp.yahoo.com:yui3

marclundgren · Mar 5, 2012 · e4310d4 · e4310d4
2 parents 975af71 + a123bc8
commit e4310d4
Show file tree

Hide file tree

Showing 17 changed files with 66 additions and 49 deletions.
diff --git a/build/calendar-base/assets/skins/night/calendar-base-skin.css b/build/calendar-base/assets/skins/night/calendar-base-skin.css
@@ -1,7 +1,5 @@
 .yui3-skin-night .yui3-calendar-content {
     padding:10px;
-    font-size:0.8em;
-    font-family:"Lucida Grande", "Lucida Sans", Calibri, Helvetica, Arial, sans-serif;
     color: #CBCBCB;
     border: 1px solid #303030;
     background: #151515; /* Old browsers */
@@ -35,6 +33,7 @@
 .yui3-skin-night .yui3-calendar-day,
 .yui3-skin-night .yui3-calendar-prevmonth-day, 
 .yui3-skin-night .yui3-calendar-nextmonth-day {
+    padding:5px;
     border: 1px solid #151515;
     background: #262727;
     text-align:center;

diff --git a/build/calendar-base/assets/skins/night/calendar-base.css b/build/calendar-base/assets/skins/night/calendar-base.css
diff --git a/build/calendar-base/assets/skins/sam/calendar-base-skin.css b/build/calendar-base/assets/skins/sam/calendar-base-skin.css
@@ -1,7 +1,5 @@
 .yui3-skin-sam .yui3-calendar-content {
     padding:10px;
-    font-size:0.8em;
-    font-family:"Lucida Grande", "Lucida Sans", Calibri, Helvetica, Arial, sans-serif;
     color: #000000;
     border: 1px solid gray;
     background: #f2f2f2; /* Old browsers */
@@ -34,6 +32,7 @@
 .yui3-skin-sam .yui3-calendar-day,
 .yui3-skin-sam .yui3-calendar-prevmonth-day, 
 .yui3-skin-sam .yui3-calendar-nextmonth-day {
+    padding:5px;
     border: 1px solid #CCCCCC;
     background: #FFFFFF;
     text-align:center;

diff --git a/build/calendar-base/assets/skins/sam/calendar-base.css b/build/calendar-base/assets/skins/sam/calendar-base.css
diff --git a/build/calendar/assets/skins/night/calendar-base-skin.css b/build/calendar/assets/skins/night/calendar-base-skin.css
@@ -1,7 +1,5 @@
 .yui3-skin-night .yui3-calendar-content {
     padding:10px;
-    font-size:0.8em;
-    font-family:"Lucida Grande", "Lucida Sans", Calibri, Helvetica, Arial, sans-serif;
     color: #CBCBCB;
     border: 1px solid #303030;
     background: #151515; /* Old browsers */
@@ -35,6 +33,7 @@
 .yui3-skin-night .yui3-calendar-day,
 .yui3-skin-night .yui3-calendar-prevmonth-day, 
 .yui3-skin-night .yui3-calendar-nextmonth-day {
+    padding:5px;
     border: 1px solid #151515;
     background: #262727;
     text-align:center;

diff --git a/build/calendar/assets/skins/sam/calendar-base-skin.css b/build/calendar/assets/skins/sam/calendar-base-skin.css
@@ -1,7 +1,5 @@
 .yui3-skin-sam .yui3-calendar-content {
     padding:10px;
-    font-size:0.8em;
-    font-family:"Lucida Grande", "Lucida Sans", Calibri, Helvetica, Arial, sans-serif;
     color: #000000;
     border: 1px solid gray;
     background: #f2f2f2; /* Old browsers */
@@ -34,6 +32,7 @@
 .yui3-skin-sam .yui3-calendar-day,
 .yui3-skin-sam .yui3-calendar-prevmonth-day, 
 .yui3-skin-sam .yui3-calendar-nextmonth-day {
+    padding:5px;
     border: 1px solid #CCCCCC;
     background: #FFFFFF;
     text-align:center;

diff --git a/build/calendar/calendar-debug.js b/build/calendar/calendar-debug.js
@@ -68,6 +68,11 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
    */ 
   initializer : function () {
     this.plug(Y.Plugin.CalendarNavigator);
+
+
+    this._keyEvents = [];
+    this._highlightedDateNode = null;
+    this._lastSelectedDate = null;
   },
 
   /**
@@ -108,9 +113,6 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
     var newNode = this._dateToNode(oDate);
     newNode.focus();
     newNode.addClass(CAL_DAY_HILITED);
-    //this._highlightedDateNode.set("tabIndex", -1);
-
-
   },
 
   /**
@@ -152,14 +154,16 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
    */ 
    _focusCalendarCell : function (ev) {
        this._highlightedDateNode = ev.target;
+       ev.stopPropagation();
    },
 
   /**
    * Handler for gain of focus of calendar grid
    * @method _focusCalendarGrid
    * @protected
    */ 
-   _focusCalendarGrid : function (ev) {
+   _focusCalendarGrid : function (ev) {     
+       this._unhighlightCurrentDateNode();
        this._highlightedDateNode = null;
    },
 
@@ -175,7 +179,6 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
         dayNum = 0,
         dir = '';
 
-
         switch(keyCode) {
           case KEY_DOWN: 
             dayNum = 7;
@@ -211,14 +214,14 @@ Y.Calendar = Y.extend(Calendar, Y.CalendarBase, {
             }
           break;
         }
+
+
+      if (keyCode == KEY_DOWN || keyCode == KEY_UP || keyCode == KEY_LEFT || keyCode == KEY_RIGHT) {
 
       if (curDate == null) {
              curDate = ydate.addMonths(this.get("date"), gridNum);
              dayNum = 0;
       }
-
-
-        if (keyCode == KEY_DOWN || keyCode == KEY_UP || keyCode == KEY_LEFT || keyCode == KEY_RIGHT) {
               ev.preventDefault();
           var newDate = ydate.addDays(curDate, dayNum),
               startDate = this.get("date"),