[Web-erp-svn] SF.net SVN: web-erp:[6100] trunk/javascripts/MiscFunctions.js

[<ex...@us...>]

Revision: 6100
          http://sourceforge.net/p/web-erp/reponame/6100
Author:   exsonqu
Date:     2013-07-18 14:14:58 +0000 (Thu, 18 Jul 2013)
Log Message:
-----------
07/18/2013: Exson: Fixed the missing negative mark problem reported by Tim. 

Modified Paths:
--------------
    trunk/javascripts/MiscFunctions.js

Modified: trunk/javascripts/MiscFunctions.js
===================================================================
--- trunk/javascripts/MiscFunctions.js	2013-07-18 10:40:24 UTC (rev 6099)
+++ trunk/javascripts/MiscFunctions.js	2013-07-18 14:14:58 UTC (rev 6100)
@@ -14,9 +14,9 @@
 	if ((k==null) || (k==0) || (k==8) || (k==9) || (k==13) || (k==27)){
 	       	return true;
 	}
-	else if ((("0123456789., ").indexOf(kC)>-1)){
-		if(("., ").indexOf(kC)>-1){
-			if(("., ").indexOf(kPrev)>-1){
+	else if ((("0123456789.-, ").indexOf(kC)>-1)){
+		if((".-, ").indexOf(kC)>-1){
+			if((".-, ").indexOf(kPrev)>-1){
 				return false;
 			}else{
 				kPrev = kC;
@@ -30,21 +30,22 @@
 	else return false; 
 }
 function rLocaleNumber(){
+	var Lang = document.getElementById('Lang').value;
 	switch(Lang){
 		case 'US':
-			var patt = /(?:^([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(0\.\d{1,})$)/;
+			var patt = /(?:^(-)?([1-9]{1,3}(?:,?\d{3})*(?:\.\d{1,})?)$)|(?:^(-)?(0\.\d{1,})$)/;
 			break;
 		case 'IN':
-			var patt = /(?:^([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^[1-9]{1,3}(\.\d+)?$)|(?:^(0\.\d{1,})$)/;
+			var patt = /(?:^(-)?([1-9]{1,2},)?(\d{2},)*(\d{3})(\.\d+)?$)|(?:^(-)?[1-9]{1,3}(\.\d+)?$)|(?:^(-)?(0\.\d{1,})$)/;
 			break;
 		case 'EE':
-			var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(0\.\d{1,})$)/;
+			var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:\.\d{1,})?$)|(?:^(-)?(0\.\d{1,})$)/;
 			break;
 		case 'FR':
-			var patt = /(?:^[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/;
+			var patt = /(?:^(-)?[1-9]{1,3}(?:\s?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/;
 			break;
 		case 'GM':
-			var patt = /(?:^[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(0,\d{1,})$)/;
+			var patt = /(?:^(-)?[1-9]{1,3}(?:\.?\d{3})*(?:,\d{1,})?$)|(?:^(-)?(0,\d{1,})$)/;
 			break;
 
 	}