Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter
In directory james.mmbase.org:/tmp/cvs-serv2146
Modified Files:
Tag: b1_5
newsletter.js showNewsletters.jsp
Log Message:
CMSC-1135(Extract the js 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.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- newsletter.js 22 Oct 2008 06:11:25 -0000 1.3.2.1
+++ newsletter.js 6 Nov 2008 10:46:33 -0000 1.3.2.2
@@ -22,11 +22,11 @@
function setOffset(offset) {
document.forms[0].offset.value = offset;
document.forms[0].submit();
- }
- function showItem(objectnumber) {
+}
+function showItem(objectnumber) {
openPopupWindow("showItem", 500, 500,
'NewsletterBounceAction.do?method=getItem&objectnumber=' + objectnumber);
}
- function sortBy(orderColumn){
+function sortBy(orderColumn){
var offset = document.forms[0].offset.value;
var oldOrderColumn = document.forms[0].order.value;
@@ -46,4 +46,36 @@
document.forms[0].direction.value = 'down';
}
document.forms[0].submit();
+}
+function resets(){
+ document.forms[0].reset();
+ var startDate = document.getElementsByName("startDate");
+ var endDate = document.getElementsByName("endDate");
+ startDate[0].value = "";
+ endDate[0].value = "";
+}
+function strDateTime(str){
+ 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;
+ }
+ 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;
}
\ No newline at end of file
+ var newStr =d.getFullYear()+r[2]+monthRel+r[2]+dateRel;
+ return newStr==str;
+}
Index: showNewsletters.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/showNewsletters.jsp,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -b -r1.17.2.3 -r1.17.2.4
--- showNewsletters.jsp 6 Nov 2008 08:31:34 -0000 1.17.2.3
+++ showNewsletters.jsp 6 Nov 2008 10:46:33 -0000 1.17.2.4
@@ -34,16 +34,9 @@
<script src="<c:url value='/js/transparent_png.js'/>"
type="text/javascript"></script>
<!--the reset button needs -->
+ <script src="<c:url value='/editors/newsletter/newsletter.js'/>"
type="text/javascript"></script>
<script language="javascript">
- function resets(){
- document.forms[0].reset();
- var startDate = document.getElementsByName("startDate");
- var endDate = document.getElementsByName("endDate");
- startDate[0].value = "";
- endDate[0].value = "";
- }
function submits(){
-
var startDate = document.getElementsByName("startDate");
var endDate = document.getElementsByName("endDate");
if(startDate[0].value!=''&&!strDateTime(startDate[0].value)) {
@@ -55,36 +48,6 @@
}
document.forms[0].submit();
}
-
- function strDateTime(str){
- 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;
- }
- 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 newStr =d.getFullYear()+r[2]+monthRel+r[2]+dateRel;
- return newStr==str;
- }
-
</script>
</head>
<body>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
