From: Jaroslav Kysela Date: Sun, 6 Dec 2015 21:24:43 +0000 (+0100) Subject: WEBUI: Fix Ext.ux.form.TwinDateField setValue fcn X-Git-Tag: v4.2.1~1357 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7914d1644241d4e23427d8a151572b38846df622;p=thirdparty%2Ftvheadend.git WEBUI: Fix Ext.ux.form.TwinDateField setValue fcn --- diff --git a/src/webui/static/app/extensions.js b/src/webui/static/app/extensions.js index 8d6ccea48..10595698a 100644 --- a/src/webui/static/app/extensions.js +++ b/src/webui/static/app/extensions.js @@ -1010,6 +1010,8 @@ Ext.ux.form.TwinDateField = Ext.extend(Ext.form.DateField, { }), setValue : Ext.form.DateField.prototype.setValue.createSequence(function(v) { + if (!this.triggers) + return; if (v !== null && v != '') { if (this.allowClear) this.getTrigger(0).show(); @@ -1591,7 +1593,7 @@ Ext.ux.form.TwinDateTimeField = Ext.extend(Ext.form.Field, { return; } if ('number' === typeof val) { - val = new Date(val); + val = new Date(val * 1000); } else if ('string' === typeof val && this.hiddenFormat) { val = Date.parseDate(val, this.hiddenFormat); } @@ -1613,6 +1615,7 @@ Ext.ux.form.TwinDateTimeField = Ext.extend(Ext.form.Field, { } } this.updateValue(); + this.value = this.getValue(); }, /**