From 7e2cde5346a730d72bb974663d76da45f0519b86 Mon Sep 17 00:00:00 2001
From: imp <imp@fanruan.com>
Date: Thu, 7 Sep 2017 22:03:22 +0800
Subject: [PATCH] conflict

---
 src/addons/slider/slider/singleslider/singleslider.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/addons/slider/slider/singleslider/singleslider.js b/src/addons/slider/slider/singleslider/singleslider.js
index 7f7b8c547..ac70baa2c 100644
--- a/src/addons/slider/slider/singleslider/singleslider.js
+++ b/src/addons/slider/slider/singleslider/singleslider.js
@@ -13,7 +13,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
     },
     _defaultConfig: function () {
         return BI.extend(BI.SingleSlider.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-single-button bi-button-track"
+            baseCls: "bi-single-slider bi-slider-track"
         });
     },
     _init: function () {
@@ -92,7 +92,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
         });
         this.label = BI.createWidget({
             type: "bi.sign_editor",
-            cls: "button-editor-button bi-border",
+            cls: "slider-editor-button bi-border",
             errorText: "",
             height: c.HEIGHT,
             width: c.EDITOR_WIDTH,
@@ -184,7 +184,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
     },
 
     _checkValidation: function (v) {
-        return !(BI.isNull(v) || v < this.min || v > this.max)
+        return BI.isNumeric(v) && !(BI.isNull(v) || v < this.min || v > this.max)
     },
 
     _setBlueTrack: function (percent) {