From 8147f648a17aa02d7688c3970d516f91f475faea Mon Sep 17 00:00:00 2001
From: Alexandre Wilhelm <contact.dogild@gmail.com>
Date: Fri, 7 Feb 2014 16:36:05 -0800
Subject: [PATCH] Fixed: Textual CPDatePicker issue with number of digit

Previously, the day/month/hour of the textual datePicker had always two digits, even when the number was under 10. For instance the day 8 was displayed 08.
Now it's like in cocoa, 8 is displayed 8.

Fixes #2059
---
 AppKit/CPDatePicker/_CPDatePickerTextField.j | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/AppKit/CPDatePicker/_CPDatePickerTextField.j b/AppKit/CPDatePicker/_CPDatePickerTextField.j
index 8dbb21eaf..9b1cd4910 100644
--- a/AppKit/CPDatePicker/_CPDatePickerTextField.j
+++ b/AppKit/CPDatePicker/_CPDatePickerTextField.j
@@ -1222,6 +1222,7 @@ var CPMonthDateType = 0,
     int _maxNumber @accessors(getter=maxNumber);
     int _minNumber @accessors(getter=minNumber);
 
+    BOOL    _firstEvent;
     CPTimer _timerEdition;
 }
 
@@ -1231,6 +1232,7 @@ var CPMonthDateType = 0,
 
 - (BOOL)acceptFirstResponder
 {
+    _firstEvent = YES;
     return NO;
 }
 
@@ -1339,7 +1341,7 @@ var CPMonthDateType = 0,
     if (keyCode != CPDeleteKeyCode && keyCode != CPDeleteForwardKeyCode  && keyCode < CPZeroKeyCode || keyCode > CPNineKeyCode)
         return;
 
-    var newValue = [self stringValue],
+    var newValue = [self stringValue].replace(/\s/g, ''),
         length = [newValue length],
         eventKeyValue = parseInt([anEvent characters]).toString();
 
@@ -1355,7 +1357,7 @@ var CPMonthDateType = 0,
         {
             _timerEdition = [CPTimer scheduledTimerWithTimeInterval:2 target:self selector:@selector(_timerKeyEvent:) userInfo:nil repeats:NO];
 
-            if ((_dateType == CPYearDateType && length == 4) || (_dateType != CPYearDateType && length == 2) || !length)
+            if (_firstEvent || !length)
                 newValue = eventKeyValue;
             else
                 newValue = parseInt(newValue).toString() + eventKeyValue;
@@ -1374,6 +1376,8 @@ var CPMonthDateType = 0,
     if (parseInt(newValue) > [self _maxNumberWithMaxDate] || ([_datePicker _isEnglishFormat] && _dateType == CPHourDateType && parseInt(newValue) > 12))
         return;
 
+    _firstEvent = NO;
+
     [super setObjectValue:newValue];
 }
 
@@ -1473,7 +1477,13 @@ var CPMonthDateType = 0,
         }
 
         while ([aStringValue length] < 2)
-            aStringValue = "0" + aStringValue;
+        {
+            if (_dateType == CPSecondDateType || _dateType == CPMinuteDateType)
+                aStringValue = @"0" + aStringValue;
+            else
+                aStringValue = @" " + aStringValue;
+        }
+
     }
 
     [super setObjectValue:aStringValue];
@@ -1612,6 +1622,7 @@ var CPMonthDateType = 0,
 */
 - (void)makeDeselectable
 {
+    _firstEvent = YES;
     [self unsetThemeState:CPThemeStateSelected];
 }