From 2bd53e72d40b785d1c194f1972e161c83a2ad8ca Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 8 Jul 2013 22:24:36 +0000 Subject: [PATCH] Change evaluation order to get popup selector working again after last fix. --- etemplate/js/et2_widget_date.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etemplate/js/et2_widget_date.js b/etemplate/js/et2_widget_date.js index fed59761e6..a4a6cb1b1e 100644 --- a/etemplate/js/et2_widget_date.js +++ b/etemplate/js/et2_widget_date.js @@ -157,14 +157,14 @@ var et2_date = et2_inputWidget.extend( this.date.setTime(text.valueOf()+localOffset); _value = Math.round(this.date.valueOf() / 1000); } - } else if (typeof _value == 'number' || !isNaN(_value)) { - // Timestamp - // JS dates use milliseconds - this.date.setTime(parseInt(_value)*1000); } else if (typeof _value == 'object' && _value.date) { this.date = _value.date; } else if (typeof _value == 'object' && _value.valueOf) { this.date = _value; + } else if (typeof _value == 'number' || !isNaN(_value)) { + // Timestamp + // JS dates use milliseconds + this.date.setTime(parseInt(_value)*1000); } // Update input - popups do, but framework doesn't