[Lada-commits] [PATCH 2 of 2] Changes to the Datetimepicker's events, InputValidation and Sanity Checks
Wald Commits
scm-commit at wald.intevation.org
Thu Mar 19 13:19:52 CET 2015
# HG changeset patch
# User Dustin Demuth <dustin at intevation.de>
# Date 1426768574 -3600
# Node ID c34e6534657235c406d1048f5b997de3f52d93be
# Parent 7d99678fbee382f20e028228c06f1b58b7301c7d
Changes to the Datetimepicker's events, InputValidation and Sanity Checks
diff -r 7d99678fbee3 -r c34e65346572 app/view/widget/base/DateTimePicker.js
--- a/app/view/widget/base/DateTimePicker.js Thu Mar 19 11:42:37 2015 +0100
+++ b/app/view/widget/base/DateTimePicker.js Thu Mar 19 13:36:14 2015 +0100
@@ -94,23 +94,23 @@
beforeRender: function () {
var me = this;
- me.hourField = new Ext.form.field.Spinner({
+ me.hourField = new Ext.form.field.Number({
ownerCt: me,
ownerLayout: me.getComponentLayout(),
value: 0,
+ valueToRaw: function (value) {
+ return (value < 10 ? '0' : '') + value; // add leading Zero
+ },
maxValue: 23,
+ maxLength: 2,
+ enforceMaxLength: true,
onSpinUp: function() {
var value = parseInt(this.getValue());
if (value === 23) {
return;
}
var newValue = value + 1;
- if (newValue < 10) {
- this.setValue('0' + newValue);
- }
- else {
- this.setValue(newValue);
- }
+ this.setValue(newValue);
},
onSpinDown: function() {
var value = parseInt(this.getValue());
@@ -118,36 +118,32 @@
return;
}
var newValue = value - 1;
- if (newValue < 10) {
- this.setValue('0' + newValue);
- }
- else {
- this.setValue(newValue);
- }
+ this.setValue(newValue);
},
listeners: {
change: me.changeTimeValue,
scope: me
- }
+ },
+ checkChangeEvents: ['change']
});
- me.minuteField = new Ext.form.field.Spinner({
+ me.minuteField = new Ext.form.field.Number({
ownerCt: me,
ownerLayout: me.getComponentLayout(),
value: 0,
maxValue: 59,
+ valueToRaw: function (value) {
+ return (value < 10 ? '0' : '') + value; // add leading Zero
+ },
+ maxLength: 2,
+ enforceMaxLength: true,
onSpinUp: function() {
var value = parseInt(this.getValue());
if (value === 59) {
return;
}
var newValue = value + 1;
- if (newValue < 10) {
- this.setValue('0' + newValue);
- }
- else {
- this.setValue(newValue);
- }
+ this.setValue(newValue);
},
onSpinDown: function() {
var value = parseInt(this.getValue());
@@ -155,17 +151,13 @@
return;
}
var newValue = value - 1;
- if (newValue < 10) {
- this.setValue('0' + newValue);
- }
- else {
- this.setValue(newValue);
- }
+ this.setValue(newValue);
},
listeners: {
change: me.changeTimeValue,
scope: me
- }
+ },
+ checkChangeEvents: ['change']
});
me.timeLabel = new Ext.form.Label({
@@ -221,8 +213,8 @@
if (value > field.maxValue) {
field.setValue(field.maxValue);
}
- else if (value < 10 && (nValue.indexOf('0') !== 0 || nValue.length < 2)) {
- field.setValue('0' + nValue);
+ if (value == null || value == "" || isNaN(value)) {
+ field.setValue('0');
}
},
More information about the Lada-commits
mailing list