Merge remote-tracking branch 'origin/master'

src/addons/sliders/js/singleslider/singleslider.label.js

@@ -14,7 +14,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
     _defaultConfig: function () {
         return BI.extend(BI.SingleSliderLabel.superclass._defaultConfig.apply(this, arguments), {
             baseCls: "bi-single-slider-label bi-slider-track",
-            digit: "",
+            digit: false,
             unit: ""
         });
     },
@@ -22,7 +22,6 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
         BI.SingleSliderLabel.superclass._init.apply(this, arguments);
 
         var self = this, o = this.options;
-        var digitExist = (o.digit === "") ? false : true;
         var c = this._constant;
         this.enable = false;
         this.value = "";
@@ -52,7 +51,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
                 self._setBlueTrack(significantPercent);
                 self._setLabelPosition(significantPercent);
                 var v = self._getValueByPercent(significantPercent);
-                v = digitExist ? v.toFixed(o.digit) : v;
+                v = o.digit === false ? v : v.toFixed(o.digit);
                 self.label.setText(v + o.unit);
                 self.value = v;
                 self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
@@ -90,7 +89,7 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
                 var significantPercent = BI.parseFloat(percent.toFixed(1));
                 self._setAllPosition(significantPercent);
                 var v = self._getValueByPercent(significantPercent);
-                v = digitExist ? v.toFixed(o.digit) : v;
+                v = o.digit === false ? v : v.toFixed(o.digit);
                 self.label.setText(v + o.unit);
                 self.value = v;
                 self.fireEvent(BI.SingleSliderLabel.EVENT_CHANGE);
@@ -221,17 +220,16 @@ BI.SingleSliderLabel = BI.inherit(BI.Widget, {
 
     setValue: function (v) {
         var o = this.options;
-        var digitExist = (o.digit === "") ? false : true;
+        v = BI.parseFloat(v);
-        var value = BI.parseFloat(v);
+        v = o.digit === false ? v : v.toFixed(o.digit);
-        value = digitExist ? value.toFixed(o.digit) : value;
+        if ((!isNaN(v))) {
-        if ((!isNaN(value))) {
+            if (this._checkValidation(v)) {
-            if (this._checkValidation(value)) {
+                this.value = v;
-                this.value = value;
             }
-            if (value > this.max) {
+            if (v > this.max) {
                 this.value = this.max;
             }
-            if (value < this.min) {
+            if (v < this.min) {
                 this.value = this.min;
             }
         }