temp fix for issue egorkhmelev#3

Author: egorkhmelev

Makefile

@@ -8,7 +8,7 @@ css_compiler: js_compiler
 js_compiler:
 	mkdir -p bin
 	rm -f bin/jquery.slider.all.js bin/jquery.slider.min.js
-	cat js/jshashtable-2.1_src.js js/jquery.numberformatter-1.2.2.js js/tmpl.js js/jquery.dependClass-0.1.js js/draggable-0.1.js js/jquery.slider.js > bin/jquery.slider.all.js
+	cat js/jshashtable-2.1_src.js js/jquery.numberformatter-1.2.3.js js/tmpl.js js/jquery.dependClass-0.1.js js/draggable-0.1.js js/jquery.slider.js > bin/jquery.slider.all.js
 	uglifyjs -nc bin/jquery.slider.all.js > bin/jquery.slider.min.js
 	rm -f bin/jquery.slider.all.js
 

bin/jquery.slider.min.js

@@ -16,11 +16,11 @@
 
 	<!-- bin/jquery.slider.min.js -->
 	<script type="text/javascript" src="js/jshashtable-2.1_src.js"></script>
-	<script type="text/javascript" src="js/jquery.numberformatter-1.2.2.js"></script>
+	<script type="text/javascript" src="js/jquery.numberformatter-1.2.3.js"></script>
 	<script type="text/javascript" src="js/tmpl.js"></script>
 	<script type="text/javascript" src="js/jquery.dependClass-0.1.js"></script>
 	<script type="text/javascript" src="js/draggable-0.1.js"></script>
-	<script type="text/javascript" src="js/jquery.slider.min.js"></script>
+	<script type="text/javascript" src="js/jquery.slider.js"></script>
   <!-- end -->
 
 	<style type="text/css" media="screen">

index.html

@@ -9,7 +9,7 @@
  * and GPL (GPL-LICENSE.txt) licenses.
  *
  * @author Michael Abernethy, Andrew Parry
- * @version 1.2.2-RELEASE ($Id$)
+ * @version 1.2.3-SNAPSHOT ($Id$)
  * 
  * Dependencies
  * 
@@ -127,15 +127,24 @@
 		}
 	};
 
-	function formatCodes(locale) {
+	function formatCodes(locale, isFullLocale) {
 		if (nfLocales.size() == 0)
 			init();
 
          // default values
          var dec = ".";
          var group = ",";
          var neg = "-";
-		 
+         
+         if (isFullLocale == false) {
+	         // Extract and convert to lower-case any language code from a real 'locale' formatted string, if not use as-is
+	         // (To prevent locale format like : "fr_FR", "en_US", "de_DE", "fr_FR", "en-US", "de-DE")
+	         if (locale.indexOf('_') != -1)
+				locale = locale.split('_')[1].toLowerCase();
+			 else if (locale.indexOf('-') != -1)
+				locale = locale.split('-')[1].toLowerCase();
+		}
+
 		 // hashtable lookup to match locale with codes
 		 var codesIndex = nfLocales.get(locale);
 		 if (codesIndex) {
@@ -201,7 +210,7 @@
 	 */
 	jQuery.formatNumber = function(numberString, options){
 		var options = jQuery.extend({}, jQuery.fn.formatNumber.defaults, options);
-		var formatData = formatCodes(options.locale.toLowerCase());
+		var formatData = formatCodes(options.locale.toLowerCase(), options.isFullLocale);
 
 		var dec = formatData.dec;
 		var group = formatData.group;
@@ -254,7 +263,7 @@
 	 */
 	jQuery._formatNumber = function(number, options, suffix, prefix, negativeInFront) {
 		var options = jQuery.extend({}, jQuery.fn.formatNumber.defaults, options);
-		var formatData = formatCodes(options.locale.toLowerCase());
+		var formatData = formatCodes(options.locale.toLowerCase(), options.isFullLocale);
 
 		var dec = formatData.dec;
 		var group = formatData.group;
@@ -336,15 +345,21 @@
 				}
 			}
 
-			// account for any pre-data 0's
+			// account for any pre-data padding
 			if (onesFormat.length > onePortion.length) {
 				var padStart = onesFormat.indexOf('0');
 				if (padStart != -1) {
 					var padLen = onesFormat.length - padStart;
 
-					// pad to left with 0's
+					// pad to left with 0's or group char
+					var pos = onesFormat.length - onePortion.length - 1;
 					while (onePortion.length < padLen) {
-						onePortion = '0' + onePortion;
+						var padChar = onesFormat.charAt(pos);
+						// replace with real group char if needed
+						if (padChar == ',')
+							padChar = group;
+						onePortion = padChar + onePortion;
+						pos--;
 					}
 				}
 			}
@@ -415,7 +430,7 @@
 	 */
 	jQuery.parseNumber = function(numberString, options) {
 		var options = jQuery.extend({}, jQuery.fn.parseNumber.defaults, options);
-		var formatData = formatCodes(options.locale.toLowerCase());
+		var formatData = formatCodes(options.locale.toLowerCase(), options.isFullLocale);
 
 		var dec = formatData.dec;
 		var group = formatData.group;
@@ -429,7 +444,7 @@
 		numberString = numberString.replace(dec,".").replace(neg,"-");
 		var validText = "";
 		var hasPercent = false;
-		if (numberString.charAt(numberString.length-1)=="%")
+		if (numberString.charAt(numberString.length - 1) == "%" || options.isPercentage == true)
 			hasPercent = true;
 		for (var i=0; i<numberString.length; i++) {
 			if (valid.indexOf(numberString.charAt(i))>-1)
@@ -438,27 +453,36 @@
 		var number = new Number(validText);
 		if (hasPercent) {
 			number = number / 100;
-			number = number.toFixed(validText.length-1);
+			var decimalPos = validText.indexOf('.');
+			if (decimalPos != -1) {
+				var decimalPoints = validText.length - decimalPos - 1;
+				number = number.toFixed(decimalPoints + 2);
+			} else {
+				number = number.toFixed(validText.length - 1);
+			}
 		}
 
 		return number;
 	};
 
 	jQuery.fn.parseNumber.defaults = {
 		locale: "us",
-		decimalSeparatorAlwaysShown: false
+		decimalSeparatorAlwaysShown: false,
+		isPercentage: false,
+		isFullLocale: false
 	};
 
 	jQuery.fn.formatNumber.defaults = {
 		format: "#,###.00",
 		locale: "us",
 		decimalSeparatorAlwaysShown: false,
 		nanForceZero: true,
-		round: true
+		round: true,
+		isFullLocale: false
 	};
 
 	Number.prototype.toFixed = function(precision) {
-    	return $._roundNumber(this, precision);
+    	return jQuery._roundNumber(this, precision);
 	};
 
 	jQuery._roundNumber = function(number, decimalPlaces) {

js/jquery.numberformatter-1.2.2.js js/jquery.numberformatter-1.2.3.js

@@ -158,7 +158,7 @@
       smooth: true,
       limits: true,
       round: 0,
-      format: { format: "#,###.##" },
+      format: { format: "#,##0.##" },
       value: "5;7",
       dimension: ""
     },

js/jquery.slider.js

@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+	<title>jSlider Zero value test</title>
+	
+	<!-- bin/jquery.slider.min.css -->
+	<link rel="stylesheet" href="../css/jslider.css" type="text/css">
+	<link rel="stylesheet" href="../css/jslider.plastic.css" type="text/css">
+  <!-- end -->
+
+	<script type="text/javascript" src="../js/jquery-1.7.1.js"></script>
+	
+	<!-- bin/jquery.slider.min.js -->
+	<script type="text/javascript" src="../js/jshashtable-2.1_src.js"></script>
+	<script type="text/javascript" src="../js/jquery.numberformatter-1.2.3.js"></script>
+	<script type="text/javascript" src="../js/tmpl.js"></script>
+	<script type="text/javascript" src="../js/jquery.dependClass-0.1.js"></script>
+	<script type="text/javascript" src="../js/draggable-0.1.js"></script>
+	<script type="text/javascript" src="../js/jquery.slider.js"></script>
+  <!-- end -->
+	
+	<style type="text/css" media="screen">
+	  body { background: #EEF0F7; }
+	 .layout { padding: 50px; font-family: Georgia, serif; }
+	 .layout-slider { margin-bottom: 60px; width: 50%; }
+	</style>
+
+</head>
+<body>
+  
+  <div class="layout">
+
+    <div class="layout-slider" style="width: 100%">
+      Slider <span style="display: inline-block; width: 400px; padding: 0 5px;"><input id="Slider1" type="slider" name="price" value="50" /></span>  in string
+    </div>
+    <script type="text/javascript" charset="utf-8">
+      jQuery("#Slider1").slider({
+        from: -50, 
+        to: 200, 
+        step: 5, 
+        dimension: '%',
+        skin: 'plastic',
+        scale: ['-50', '|', '0', '|', '50', '|', '100', '|', '150', '|', '200']
+      });
+    </script>
+
+  </div>
+</body>
+</html>