Portal
Forge

Changeset 615

Timestamp:

10/18/07 23:28:24 (1 year ago)

Author:

laurentj

Message:

fixed bug #309: In jForm, javascript date validation doesn't work. p=arnaudj

Files:

branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (5 diffs)
branches/1.0beta3.x/lib/jelix-www/js/jforms.js (modified) (5 diffs)
branches/1.0beta3.x/lib/jelix-www/xul/jxulform.xml (modified) (1 diff)
branches/1.0beta3.x/lib/jelix-www/xul/jxulform.xml (modified) (1 diff)
trunk/lib/jelix-www/js/jforms.js (modified) (5 diffs)
trunk/lib/jelix-www/js/jforms.js (modified) (5 diffs)
trunk/lib/jelix-www/xul/jxulform.xml (modified) (1 diff)
trunk/lib/jelix-www/xul/jxulform.xml (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

branches/1.0beta3.x/lib/jelix-www/js/jforms.js

r612	r615
94	94	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
95	95	if(t == null){ ok=false; break; }
96		var yy = parseInt(t[1]);
97		var mm = parseInt(t[2]) -1;
98		var dd = parseInt(t[3]);
99		var th = parseInt(t[4]);
100		var tm = parseInt(t[5]);
101		var ts = parseInt(t[6]);
	96	var yy = parseInt(t[1],10);
	97	var mm = parseInt(t[2],10) -1;
	98	var dd = parseInt(t[3],10);
	99	var th = parseInt(t[4],10);
	100	var tm = parseInt(t[5],10);
	101	var ts = parseInt(t[6],10);
102	102	var dt = new Date(yy,mm,dd,th,tn,ts);
103	103	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate() \|\| th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
109	109	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2})$/);
110	110	if(t == null){ ok=false; break; }
111		var yy = parseInt(t[1]);
112		var mm = parseInt(t[2]) -1;
113		var dd = parseInt(t[3]);
	111	var yy = parseInt(t[1],10);
	112	var mm = parseInt(t[2],10) -1;
	113	var dd = parseInt(t[3],10);
114	114	var dt = new Date(yy,mm,dd,0,0,0);
115	115	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate())
…	…
122	122	var t = val.match(/^(\d{2}):(\d{2}):(\d{2})$/);
123	123	if(t == null){ ok=false; break; }
124		var th = parseInt(t[4]);
125		var tm = parseInt(t[5]);
126		var ts = parseInt(t[6]);
	124	var th = parseInt(t[4],10);
	125	var tm = parseInt(t[5],10);
	126	var ts = parseInt(t[6],10);
127	127	var dt = new Date(2007,05,02,th,tn,ts);
128	128	if(th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
136	136	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
137	137	if(t == null){ ok=false; break; }
138		yy = parseInt(t[3]);
139		mm = parseInt(t[2]) -1;
140		dd = parseInt(t[1]);
141		th = parseInt(t[4]);
142		tm = parseInt(t[5]);
143		ts = parseInt(t[6]);
	138	yy = parseInt(t[3],10);
	139	mm = parseInt(t[2],10) -1;
	140	dd = parseInt(t[1],10);
	141	th = parseInt(t[4],10);
	142	tm = parseInt(t[5],10);
	143	ts = parseInt(t[6],10);
144	144	}else{
145	145	//default is en_* format
146	146	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
147	147	if(t == null){ ok=false; break; }
148		yy = parseInt(t[3]);
149		mm = parseInt(t[1]) -1;
150		dd = parseInt(t[2]);
151		th = parseInt(t[4]);
152		tm = parseInt(t[5]);
153		ts = parseInt(t[6]);
	148	yy = parseInt(t[3],10);
	149	mm = parseInt(t[1],10) -1;
	150	dd = parseInt(t[2],10);
	151	th = parseInt(t[4],10);
	152	tm = parseInt(t[5],10);
	153	ts = parseInt(t[6],10);
154	154	}
155	155	var dt = new Date(yy,mm,dd,th,tn,ts);
…	…
164	164	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
165	165	if(t == null){ ok=false; break; }
166		yy = parseInt(t[3]);
167		mm = parseInt(t[2]) -1;
168		dd = parseInt(t[1]);
	166	yy = parseInt(t[3],10);
	167	mm = parseInt(t[2],10) -1;
	168	dd = parseInt(t[1],10);
169	169	}else{
170	170	//default is en_* format
171	171	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
172	172	if(t == null){ ok=false; break; }
173		yy = parseInt(t[3]);
174		mm = parseInt(t[1]) -1;
175		dd = parseInt(t[2]);
	173	yy = parseInt(t[3],10);
	174	mm = parseInt(t[1],10) -1;
	175	dd = parseInt(t[2],10);
176	176	}
177	177	var dt = new Date(yy,mm,dd,0,0,0);

branches/1.0beta3.x/lib/jelix-www/js/jforms.js

r612	r615
94	94	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
95	95	if(t == null){ ok=false; break; }
96		var yy = parseInt(t[1]);
97		var mm = parseInt(t[2]) -1;
98		var dd = parseInt(t[3]);
99		var th = parseInt(t[4]);
100		var tm = parseInt(t[5]);
101		var ts = parseInt(t[6]);
	96	var yy = parseInt(t[1],10);
	97	var mm = parseInt(t[2],10) -1;
	98	var dd = parseInt(t[3],10);
	99	var th = parseInt(t[4],10);
	100	var tm = parseInt(t[5],10);
	101	var ts = parseInt(t[6],10);
102	102	var dt = new Date(yy,mm,dd,th,tn,ts);
103	103	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate() \|\| th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
109	109	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2})$/);
110	110	if(t == null){ ok=false; break; }
111		var yy = parseInt(t[1]);
112		var mm = parseInt(t[2]) -1;
113		var dd = parseInt(t[3]);
	111	var yy = parseInt(t[1],10);
	112	var mm = parseInt(t[2],10) -1;
	113	var dd = parseInt(t[3],10);
114	114	var dt = new Date(yy,mm,dd,0,0,0);
115	115	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate())
…	…
122	122	var t = val.match(/^(\d{2}):(\d{2}):(\d{2})$/);
123	123	if(t == null){ ok=false; break; }
124		var th = parseInt(t[4]);
125		var tm = parseInt(t[5]);
126		var ts = parseInt(t[6]);
	124	var th = parseInt(t[4],10);
	125	var tm = parseInt(t[5],10);
	126	var ts = parseInt(t[6],10);
127	127	var dt = new Date(2007,05,02,th,tn,ts);
128	128	if(th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
136	136	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
137	137	if(t == null){ ok=false; break; }
138		yy = parseInt(t[3]);
139		mm = parseInt(t[2]) -1;
140		dd = parseInt(t[1]);
141		th = parseInt(t[4]);
142		tm = parseInt(t[5]);
143		ts = parseInt(t[6]);
	138	yy = parseInt(t[3],10);
	139	mm = parseInt(t[2],10) -1;
	140	dd = parseInt(t[1],10);
	141	th = parseInt(t[4],10);
	142	tm = parseInt(t[5],10);
	143	ts = parseInt(t[6],10);
144	144	}else{
145	145	//default is en_* format
146	146	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
147	147	if(t == null){ ok=false; break; }
148		yy = parseInt(t[3]);
149		mm = parseInt(t[1]) -1;
150		dd = parseInt(t[2]);
151		th = parseInt(t[4]);
152		tm = parseInt(t[5]);
153		ts = parseInt(t[6]);
	148	yy = parseInt(t[3],10);
	149	mm = parseInt(t[1],10) -1;
	150	dd = parseInt(t[2],10);
	151	th = parseInt(t[4],10);
	152	tm = parseInt(t[5],10);
	153	ts = parseInt(t[6],10);
154	154	}
155	155	var dt = new Date(yy,mm,dd,th,tn,ts);
…	…
164	164	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
165	165	if(t == null){ ok=false; break; }
166		yy = parseInt(t[3]);
167		mm = parseInt(t[2]) -1;
168		dd = parseInt(t[1]);
	166	yy = parseInt(t[3],10);
	167	mm = parseInt(t[2],10) -1;
	168	dd = parseInt(t[1],10);
169	169	}else{
170	170	//default is en_* format
171	171	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
172	172	if(t == null){ ok=false; break; }
173		yy = parseInt(t[3]);
174		mm = parseInt(t[1]) -1;
175		dd = parseInt(t[2]);
	173	yy = parseInt(t[3],10);
	174	mm = parseInt(t[1],10) -1;
	175	dd = parseInt(t[2],10);
176	176	}
177	177	var dt = new Date(yy,mm,dd,0,0,0);

branches/1.0beta3.x/lib/jelix-www/xul/jxulform.xml

r485	r615
353	353	break;
354	354	case 'url':
355		~~result = /^(http\|https\|ftp):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$/.test(valuews);~~
356		~~break;~~
357	355	case 'uri':
358		result = /^~~(\w{3,}):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$~~/.test(valuews);
	356	result = /^[a-z]+:\/\/((((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))((\/)\|$)/.test(valuews);
359	357	break;
360	358	case 'mail':
361		result=/^~~[\w_\.\-]+\@([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum~~))$/.test(valuews);
	359	result=/^((\"[^\"f\n\r\t\b]+\")\|([\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+(\.[\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+)*))@((\[(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\])\|(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/.test(valuews);
362	360	break;
363	361	case 'boolean':

branches/1.0beta3.x/lib/jelix-www/xul/jxulform.xml

r485	r615
353	353	break;
354	354	case 'url':
355		~~result = /^(http\|https\|ftp):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$/.test(valuews);~~
356		~~break;~~
357	355	case 'uri':
358		result = /^~~(\w{3,}):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$~~/.test(valuews);
	356	result = /^[a-z]+:\/\/((((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))((\/)\|$)/.test(valuews);
359	357	break;
360	358	case 'mail':
361		result=/^~~[\w_\.\-]+\@([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum~~))$/.test(valuews);
	359	result=/^((\"[^\"f\n\r\t\b]+\")\|([\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+(\.[\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+)*))@((\[(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\])\|(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/.test(valuews);
362	360	break;
363	361	case 'boolean':

trunk/lib/jelix-www/js/jforms.js

r612	r615
94	94	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
95	95	if(t == null){ ok=false; break; }
96		var yy = parseInt(t[1]);
97		var mm = parseInt(t[2]) -1;
98		var dd = parseInt(t[3]);
99		var th = parseInt(t[4]);
100		var tm = parseInt(t[5]);
101		var ts = parseInt(t[6]);
	96	var yy = parseInt(t[1],10);
	97	var mm = parseInt(t[2],10) -1;
	98	var dd = parseInt(t[3],10);
	99	var th = parseInt(t[4],10);
	100	var tm = parseInt(t[5],10);
	101	var ts = parseInt(t[6],10);
102	102	var dt = new Date(yy,mm,dd,th,tn,ts);
103	103	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate() \|\| th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
109	109	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2})$/);
110	110	if(t == null){ ok=false; break; }
111		var yy = parseInt(t[1]);
112		var mm = parseInt(t[2]) -1;
113		var dd = parseInt(t[3]);
	111	var yy = parseInt(t[1],10);
	112	var mm = parseInt(t[2],10) -1;
	113	var dd = parseInt(t[3],10);
114	114	var dt = new Date(yy,mm,dd,0,0,0);
115	115	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate())
…	…
122	122	var t = val.match(/^(\d{2}):(\d{2}):(\d{2})$/);
123	123	if(t == null){ ok=false; break; }
124		var th = parseInt(t[4]);
125		var tm = parseInt(t[5]);
126		var ts = parseInt(t[6]);
	124	var th = parseInt(t[4],10);
	125	var tm = parseInt(t[5],10);
	126	var ts = parseInt(t[6],10);
127	127	var dt = new Date(2007,05,02,th,tn,ts);
128	128	if(th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
136	136	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
137	137	if(t == null){ ok=false; break; }
138		yy = parseInt(t[3]);
139		mm = parseInt(t[2]) -1;
140		dd = parseInt(t[1]);
141		th = parseInt(t[4]);
142		tm = parseInt(t[5]);
143		ts = parseInt(t[6]);
	138	yy = parseInt(t[3],10);
	139	mm = parseInt(t[2],10) -1;
	140	dd = parseInt(t[1],10);
	141	th = parseInt(t[4],10);
	142	tm = parseInt(t[5],10);
	143	ts = parseInt(t[6],10);
144	144	}else{
145	145	//default is en_* format
146	146	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
147	147	if(t == null){ ok=false; break; }
148		yy = parseInt(t[3]);
149		mm = parseInt(t[1]) -1;
150		dd = parseInt(t[2]);
151		th = parseInt(t[4]);
152		tm = parseInt(t[5]);
153		ts = parseInt(t[6]);
	148	yy = parseInt(t[3],10);
	149	mm = parseInt(t[1],10) -1;
	150	dd = parseInt(t[2],10);
	151	th = parseInt(t[4],10);
	152	tm = parseInt(t[5],10);
	153	ts = parseInt(t[6],10);
154	154	}
155	155	var dt = new Date(yy,mm,dd,th,tn,ts);
…	…
164	164	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
165	165	if(t == null){ ok=false; break; }
166		yy = parseInt(t[3]);
167		mm = parseInt(t[2]) -1;
168		dd = parseInt(t[1]);
	166	yy = parseInt(t[3],10);
	167	mm = parseInt(t[2],10) -1;
	168	dd = parseInt(t[1],10);
169	169	}else{
170	170	//default is en_* format
171	171	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
172	172	if(t == null){ ok=false; break; }
173		yy = parseInt(t[3]);
174		mm = parseInt(t[1]) -1;
175		dd = parseInt(t[2]);
	173	yy = parseInt(t[3],10);
	174	mm = parseInt(t[1],10) -1;
	175	dd = parseInt(t[2],10);
176	176	}
177	177	var dt = new Date(yy,mm,dd,0,0,0);

trunk/lib/jelix-www/js/jforms.js

r612	r615
94	94	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2}):(\d{2})$/);
95	95	if(t == null){ ok=false; break; }
96		var yy = parseInt(t[1]);
97		var mm = parseInt(t[2]) -1;
98		var dd = parseInt(t[3]);
99		var th = parseInt(t[4]);
100		var tm = parseInt(t[5]);
101		var ts = parseInt(t[6]);
	96	var yy = parseInt(t[1],10);
	97	var mm = parseInt(t[2],10) -1;
	98	var dd = parseInt(t[3],10);
	99	var th = parseInt(t[4],10);
	100	var tm = parseInt(t[5],10);
	101	var ts = parseInt(t[6],10);
102	102	var dt = new Date(yy,mm,dd,th,tn,ts);
103	103	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate() \|\| th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
109	109	var t = val.match(/^(\d{4})\-(\d{2})\-(\d{2})$/);
110	110	if(t == null){ ok=false; break; }
111		var yy = parseInt(t[1]);
112		var mm = parseInt(t[2]) -1;
113		var dd = parseInt(t[3]);
	111	var yy = parseInt(t[1],10);
	112	var mm = parseInt(t[2],10) -1;
	113	var dd = parseInt(t[3],10);
114	114	var dt = new Date(yy,mm,dd,0,0,0);
115	115	if(yy != dt.getFullYear() \|\| mm != dt.getMonth() \|\| dd != dt.getDate())
…	…
122	122	var t = val.match(/^(\d{2}):(\d{2}):(\d{2})$/);
123	123	if(t == null){ ok=false; break; }
124		var th = parseInt(t[4]);
125		var tm = parseInt(t[5]);
126		var ts = parseInt(t[6]);
	124	var th = parseInt(t[4],10);
	125	var tm = parseInt(t[5],10);
	126	var ts = parseInt(t[6],10);
127	127	var dt = new Date(2007,05,02,th,tn,ts);
128	128	if(th != dt.getHours() \|\| tm != dt.getMinutes() \|\| ts != dt.getSeconds())
…	…
136	136	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
137	137	if(t == null){ ok=false; break; }
138		yy = parseInt(t[3]);
139		mm = parseInt(t[2]) -1;
140		dd = parseInt(t[1]);
141		th = parseInt(t[4]);
142		tm = parseInt(t[5]);
143		ts = parseInt(t[6]);
	138	yy = parseInt(t[3],10);
	139	mm = parseInt(t[2],10) -1;
	140	dd = parseInt(t[1],10);
	141	th = parseInt(t[4],10);
	142	tm = parseInt(t[5],10);
	143	ts = parseInt(t[6],10);
144	144	}else{
145	145	//default is en_* format
146	146	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4}) (\d{2}):(\d{2}):(\d{2})$/);
147	147	if(t == null){ ok=false; break; }
148		yy = parseInt(t[3]);
149		mm = parseInt(t[1]) -1;
150		dd = parseInt(t[2]);
151		th = parseInt(t[4]);
152		tm = parseInt(t[5]);
153		ts = parseInt(t[6]);
	148	yy = parseInt(t[3],10);
	149	mm = parseInt(t[1],10) -1;
	150	dd = parseInt(t[2],10);
	151	th = parseInt(t[4],10);
	152	tm = parseInt(t[5],10);
	153	ts = parseInt(t[6],10);
154	154	}
155	155	var dt = new Date(yy,mm,dd,th,tn,ts);
…	…
164	164	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
165	165	if(t == null){ ok=false; break; }
166		yy = parseInt(t[3]);
167		mm = parseInt(t[2]) -1;
168		dd = parseInt(t[1]);
	166	yy = parseInt(t[3],10);
	167	mm = parseInt(t[2],10) -1;
	168	dd = parseInt(t[1],10);
169	169	}else{
170	170	//default is en_* format
171	171	var t = val.match(/^(\d{2})\/(\d{2})\/(\d{4})$/);
172	172	if(t == null){ ok=false; break; }
173		yy = parseInt(t[3]);
174		mm = parseInt(t[1]) -1;
175		dd = parseInt(t[2]);
	173	yy = parseInt(t[3],10);
	174	mm = parseInt(t[1],10) -1;
	175	dd = parseInt(t[2],10);
176	176	}
177	177	var dt = new Date(yy,mm,dd,0,0,0);

trunk/lib/jelix-www/xul/jxulform.xml

r485	r615
353	353	break;
354	354	case 'url':
355		~~result = /^(http\|https\|ftp):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$/.test(valuews);~~
356		~~break;~~
357	355	case 'uri':
358		result = /^~~(\w{3,}):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$~~/.test(valuews);
	356	result = /^[a-z]+:\/\/((((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))((\/)\|$)/.test(valuews);
359	357	break;
360	358	case 'mail':
361		result=/^~~[\w_\.\-]+\@([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum~~))$/.test(valuews);
	359	result=/^((\"[^\"f\n\r\t\b]+\")\|([\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+(\.[\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+)*))@((\[(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\])\|(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/.test(valuews);
362	360	break;
363	361	case 'boolean':

trunk/lib/jelix-www/xul/jxulform.xml

r485	r615
353	353	break;
354	354	case 'url':
355		~~result = /^(http\|https\|ftp):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$/.test(valuews);~~
356		~~break;~~
357	355	case 'uri':
358		result = /^~~(\w{3,}):\/\/([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum))(\/[\w\-\.]+)+$~~/.test(valuews);
	356	result = /^[a-z]+:\/\/((((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))((\/)\|$)/.test(valuews);
359	357	break;
360	358	case 'mail':
361		result=/^~~[\w_\.\-]+\@([\w\-]+\.)+(\w{2}\|(com\|net\|org\|edu\|int\|mil\|gov\|arpa\|biz\|aero\|name\|coop\|info\|pro\|museum~~))$/.test(valuews);
	359	result=/^((\"[^\"f\n\r\t\b]+\")\|([\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+(\.[\w\!\#\$\%\&\'\\+\-\~\/\^\`\\|\{\}]+)*))@((\[(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\])\|(((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9]))\.((25[0-5])\|(2[0-4][0-9])\|([0-1]?[0-9]?[0-9])))\|((([A-Za-z0-9\-])+\.)+[A-Za-z\-]+))$/.test(valuews);
362	360	break;
363	361	case 'boolean':

Download in other formats: Unified Diff Zip Archive