Changeset 859
- Timestamp:
- 04/01/08 17:46:59 (8 months ago)
- Files:
-
- trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl (modified) (1 diff)
- trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl (modified) (1 diff)
- trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl (modified) (1 diff)
- trunk/lib/jelix-www/js/jforms.js (modified) (9 diffs)
- trunk/lib/jelix-www/js/jforms.js (modified) (9 diffs)
- trunk/lib/jelix-www/js/jforms.js (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl
r236 r859 5 5 if (document.getElementById) {ldelim} 6 6 {section name=p loop=$info} 7 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 8 tree.setBehavior('classic'); 9 7 10 {if $info[p].subpackage == ""} 8 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 9 tree.setBehavior('classic'); 11 10 12 11 13 {if $hastodos} trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl
r236 r859 5 5 if (document.getElementById) {ldelim} 6 6 {section name=p loop=$info} 7 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 8 tree.setBehavior('classic'); 9 7 10 {if $info[p].subpackage == ""} 8 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 9 tree.setBehavior('classic'); 11 10 12 11 13 {if $hastodos} trunk/build/phpdoc/Converters/HTML/frames/templates/DOM/jelix/templates/left_frame.tpl
r236 r859 5 5 if (document.getElementById) {ldelim} 6 6 {section name=p loop=$info} 7 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 8 tree.setBehavior('classic'); 9 7 10 {if $info[p].subpackage == ""} 8 var tree = new WebFXTree('<span class="package">{$info.0.package|escape:"quotes"}</span>'); 9 tree.setBehavior('classic'); 11 10 12 11 13 {if $hastodos} trunk/lib/jelix-www/js/jforms.js
r768 r859 177 177 break; 178 178 case 'url' : 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1) 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1); 180 180 break; 181 181 case 'email' : 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1) 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1); 183 183 break; 184 184 case 'ipv4' : 185 185 var t = val.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/); 186 186 if(t) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255); 188 188 else 189 189 ok = false; 190 190 break; 191 191 case 'ipv6' : 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1) 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1); 193 193 break; 194 194 } … … 249 249 } else if(elt.item){ 250 250 // this is a NodeList of radio buttons 251 value = [] 251 value = []; 252 252 for (var i = 0; i < elt.length; i++) { 253 253 var radio = elt.item(i); … … 274 274 } 275 275 } 276 } 276 }; 277 277 278 278 /** … … 284 284 this.errorDecorator = new jFormsErrorDecoratorAlert(); 285 285 this.helpDecorator = new jFormsHelpDecoratorAlert(); 286 } 286 }; 287 287 288 288 jFormsForm.prototype={ … … 298 298 this.helpDecorator = decorator; 299 299 } 300 } 300 }; 301 301 302 302 /* … … 316 316 this.minLength = -1; 317 317 this.maxLength = -1; 318 } 318 }; 319 319 320 320 … … 324 324 function jFormsErrorDecoratorAlert(){ 325 325 this.message = ''; 326 } 326 }; 327 327 328 328 jFormsErrorDecoratorAlert.prototype = { … … 344 344 } 345 345 } 346 } 346 }; 347 347 348 348 … … 352 352 function jFormsHelpDecoratorAlert() { 353 353 354 } 354 }; 355 355 jFormsHelpDecoratorAlert.prototype = { 356 356 show : function( message){ 357 357 alert(message); 358 358 } 359 } 360 359 }; 360 trunk/lib/jelix-www/js/jforms.js
r768 r859 177 177 break; 178 178 case 'url' : 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1) 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1); 180 180 break; 181 181 case 'email' : 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1) 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1); 183 183 break; 184 184 case 'ipv4' : 185 185 var t = val.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/); 186 186 if(t) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255); 188 188 else 189 189 ok = false; 190 190 break; 191 191 case 'ipv6' : 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1) 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1); 193 193 break; 194 194 } … … 249 249 } else if(elt.item){ 250 250 // this is a NodeList of radio buttons 251 value = [] 251 value = []; 252 252 for (var i = 0; i < elt.length; i++) { 253 253 var radio = elt.item(i); … … 274 274 } 275 275 } 276 } 276 }; 277 277 278 278 /** … … 284 284 this.errorDecorator = new jFormsErrorDecoratorAlert(); 285 285 this.helpDecorator = new jFormsHelpDecoratorAlert(); 286 } 286 }; 287 287 288 288 jFormsForm.prototype={ … … 298 298 this.helpDecorator = decorator; 299 299 } 300 } 300 }; 301 301 302 302 /* … … 316 316 this.minLength = -1; 317 317 this.maxLength = -1; 318 } 318 }; 319 319 320 320 … … 324 324 function jFormsErrorDecoratorAlert(){ 325 325 this.message = ''; 326 } 326 }; 327 327 328 328 jFormsErrorDecoratorAlert.prototype = { … … 344 344 } 345 345 } 346 } 346 }; 347 347 348 348 … … 352 352 function jFormsHelpDecoratorAlert() { 353 353 354 } 354 }; 355 355 jFormsHelpDecoratorAlert.prototype = { 356 356 show : function( message){ 357 357 alert(message); 358 358 } 359 } 360 359 }; 360 trunk/lib/jelix-www/js/jforms.js
r768 r859 177 177 break; 178 178 case 'url' : 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1) 179 ok = (val.search(/^[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\-]+))((\/)|$)/) != -1); 180 180 break; 181 181 case 'email' : 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1) 182 ok = (val.search(/^((\"[^\"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\-]+))$/) != -1); 183 183 break; 184 184 case 'ipv4' : 185 185 var t = val.match(/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/); 186 186 if(t) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255) 187 ok = (t[1] > 255 || t[2] > 255 || t[3] > 255 || t[4] > 255); 188 188 else 189 189 ok = false; 190 190 break; 191 191 case 'ipv6' : 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1) 192 ok = (val.search(/^([a-f0-9]{1,4})(:([a-f0-9]{1,4})){7}$/i) != -1); 193 193 break; 194 194 } … … 249 249 } else if(elt.item){ 250 250 // this is a NodeList of radio buttons 251 value = [] 251 value = []; 252 252 for (var i = 0; i < elt.length; i++) { 253 253 var radio = elt.item(i); … … 274 274 } 275 275 } 276 } 276 }; 277 277 278 278 /** … … 284 284 this.errorDecorator = new jFormsErrorDecoratorAlert(); 285 285 this.helpDecorator = new jFormsHelpDecoratorAlert(); 286 } 286 }; 287 287 288 288 jFormsForm.prototype={ … … 298 298 this.helpDecorator = decorator; 299 299 } 300 } 300 }; 301 301 302 302 /* … … 316 316 this.minLength = -1; 317 317 this.maxLength = -1; 318 } 318 }; 319 319 320 320 … … 324 324 function jFormsErrorDecoratorAlert(){ 325 325 this.message = ''; 326 } 326 }; 327 327 328 328 jFormsErrorDecoratorAlert.prototype = { … … 344 344 } 345 345 } 346 } 346 }; 347 347 348 348 … … 352 352 function jFormsHelpDecoratorAlert() { 353 353 354 } 354 }; 355 355 jFormsHelpDecoratorAlert.prototype = { 356 356 show : function( message){ 357 357 alert(message); 358 358 } 359 } 360 359 }; 360
