Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv22120
Modified Files:
Tag: b1_5
newsletter.js
Log Message:
CMSC-1135(Improve the code.)
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1135
Index: newsletter.js
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/newsletter.js,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- newsletter.js 6 Nov 2008 10:46:33 -0000 1.3.2.2
+++ newsletter.js 7 Nov 2008 03:03:24 -0000 1.3.2.3
@@ -58,24 +58,19 @@
var reg = /^(\d{1,4})(-|\/)(\d{1,2})\2(\d{1,2})$/;
var r = str.match(reg);
if(r==null)return false;
- var datenum = parseInt(r[4],10);
- if(datenum>=1 && datenum<=9){
- datenum = '0'+datenum;
- }
- var monthnum = parseInt(r[3],10);
- if(monthnum >=1 && monthnum<=9){
- monthnum = '0' +monthnum;
- }
+ var datenum = formatDate(r[4]);
+ var monthnum = formatDate(r[3]);
str = r[1]+r[2]+monthnum+r[2]+datenum;
var d= new Date(r[1], r[3]-1,r[4]);
- var dateRel = parseInt(d.getDate(),10);
- if(dateRel >=1 && dateRel <=9){
- dateRel = '0'+dateRel;
- }
- var monthRel = parseInt(d.getMonth()+1,10);
- if(monthRel >=1 && monthRel <=9){
- monthRel = '0' +monthRel;
- }
+ var dateRel = formatDate(d.getDate());
+ var monthRel = formatDate(d.getMonth()+1);
var newStr =d.getFullYear()+r[2]+monthRel+r[2]+dateRel;
return newStr==str;
}
+function formatDate(str){
+ var newdate = parseInt(str,10);
+ if(newdate >=1 && newdate <=9){
+ newdate = '0'+newdate;
+ }
+ return newdate;
+}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
