Changeset 816 for tapas/web/resources/js
- Timestamp:
- 03/12/15 12:28:06 (9 years ago)
- Location:
- tapas/web/resources/js
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
tapas/web/resources/js/classesForJQuery/LoginButton.js
r779 r816 122 122 if( this.jSONUser ) 123 123 { 124 var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName + " (" + loginTexts[this.jSONUser.role] + ")"; 124 //var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName + " (" + loginTexts[this.jSONUser.role] + ")"; 125 var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName ; 125 126 126 127 var loginButton = new ComplexButton( {value:textLogin, parent:this.parent, id:"button_login", classNameToAdd: this.classNameToAdd} ); -
tapas/web/resources/js/tools/controls.js
r529 r816 44 44 } 45 45 46 47 48 function isDate( val ) 49 { 50 //return (/^(([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9])\.([0-2]*[0-9][0-9]))$/.test(val)); 51 //if( !(/^([0-2]?[0-9]):([0-5]+[0-9]+):([0-5]+[0-9]+)*$/.test( val )) || isEmpty( val.toString() ) ) 52 53 if( !(/^([1-2]+[0-9]+[0-9]+[0-9]+)-([0-1]+[1-9]+)-([0-3]+[0-9]+) ([0-2]?[0-9]):([0-5]+[0-9]+):([0-5]+[0-9]+)*$/.test( val )) ) 54 return false; 55 else 56 { 57 58 var tab = val.split( " " ); 59 var tab2 = tab[0].split( "-" ); 60 61 if( tab2[1] > 12 ) return false; 62 63 if( tab2[1] == 2 && tab2[2] > 29 ) return false; 64 65 if( tab2[2] > 31 ) return false; 66 67 68 tab = val.split( ":" ); 69 70 if( tab[0] > 24 ) return false; 71 72 return true; 73 } 74 75 //return (/^(([0-9]*[0-9]+):([0-9]+[0-9]+):([0-9]+[0-9]+))$/.test(val)); 76 } 46 77 47 78 … … 99 130 } 100 131 132 function isSupS( number, limit ) 133 { 134 return ( number > limit ); 135 } 136 101 137 function isDiff( val, badvalue ) 102 138 {
Note: See TracChangeset
for help on using the changeset viewer.