From 95b97a5f076acdf7608536b5bed54d78dbb9a32a Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 15 Jun 2011 09:37:56 +0000
Subject: [PATCH] See ChangeLog

Monotone-Parent: dfeefc82404a132aa08f14ba4c9280ff1b64df27
Monotone-Revision: 43f0336a691891085c119dd6f330fc1e644705d6

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-06-15T09:37:56
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     |  4 ++++
 UI/WebServerResources/SOGoTimePicker.js       | 20 +++++++++----------
 UI/WebServerResources/UIxAppointmentEditor.js |  1 +
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e96f7878f..394aa68cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-06-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/SOGoTimePicker.js (onChange): the
+	semi-colon is no longer necessary. Also fixed the update the
+	widget when manually entering a time.
+
 	* UI/WebServerResources/MailerUI.js (configureDraggables): added
 	delay of 100ms before dragging starts.
 
diff --git a/UI/WebServerResources/SOGoTimePicker.js b/UI/WebServerResources/SOGoTimePicker.js
index f7294e1ce..bb15132bd 100644
--- a/UI/WebServerResources/SOGoTimePicker.js
+++ b/UI/WebServerResources/SOGoTimePicker.js
@@ -94,7 +94,6 @@ var SOGoTimePickerInterface = {
             left = windowWidth - divWidth - 2;
             arrow += (inputPosition[0] - left);
         }
-        //var top = inputPosition[1] + parseInt(inputDimensions['height']/2);
         var top = inputPosition[1] + 12;
         this.div.setStyle({ top: top+"px",
                             left: left+"px",
@@ -157,10 +156,10 @@ var SOGoTimePickerInterface = {
         this.div.down('.SOGoTimePickerHour_' + this.hours).removeClassName("selected");
         this.div.select('.SOGoTimePickerMinute_' + this.minutes).each(function(e) { e.removeClassName("selected") });
 
-        var matches = this.value.match(/([0-9]+):([0-9]+)/);
+        var matches = this.value.match(/([0-9]{1,2}):?([0-9]{2})/);
         if (matches) {
             this.hours = matches[1];
-            this.minutes = matches[2];
+            this.minutes = matches[2] || '0';
             if (parseInt(this.hours) > 23) this.hours = 23;
             if (parseInt(this.minutes) > 59) this.minutes = 59;
             if (this.minutes % 5 == 0) {
@@ -176,20 +175,19 @@ var SOGoTimePickerInterface = {
             this.div.select('.SOGoTimePickerMinute_' + this.minutes).each(function(e) { e.addClassName("selected") });
         }
          
-        this._updateValue();
+        this._updateValue(true);
     },
 
     onKeydown: function (event) {
         this.div.hide();
         this.disposeHandler.stop();
         if (event.metaKey == 1 || event.ctrlKey == 1 ||
-            event.keyCode == Event.KEY_TAB)
+            event.keyCode == Event.KEY_TAB ||
+            event.keyCode == Event.KEY_BACKSPACE)
             return true;
-        if (event.keyCode > 57 && event.keyCode != 186 ||
-            event.keyCode == 186 && this.value.indexOf(":") >= 0 ||
-            event.keyCode != Event.KEY_BACKSPACE && this.value.length > 4) {
+        if (event.keyCode > 57 && event.keyCode != 186 || // 186 not recognized in FF
+            event.keyCode == 186 && this.value.indexOf(":") >= 0)
             Event.stop(event);
-        }
     },
 
     onEnter: function (event) {
@@ -210,9 +208,9 @@ var SOGoTimePickerInterface = {
         }
     },
 
-    _updateValue: function () {
+    _updateValue: function (force) {
         var value = this.hours + ':' + this.minutes;
-        if (value != this.value) {
+        if (force || value != this.value) {
             this.value = value;
             this.fire("time:change");
         }
diff --git a/UI/WebServerResources/UIxAppointmentEditor.js b/UI/WebServerResources/UIxAppointmentEditor.js
index b2443f824..9a2950761 100644
--- a/UI/WebServerResources/UIxAppointmentEditor.js
+++ b/UI/WebServerResources/UIxAppointmentEditor.js
@@ -287,6 +287,7 @@ function onAdjustTime(event) {
         window.timeWidgets['end']['time'].updateShadowValue();
         window.timeWidgets['start']['date'].updateShadowValue();
         window.timeWidgets['start']['time'].updateShadowValue();
+        window.timeWidgets['end']['time'].onChange(); // method from SOGoTimePicker
     }
     else {
         // End date was changed