Merge branch 'master' of github.com:react-component/slider

This commit is contained in:
Benjy Cui
2015-07-15 14:21:11 +08:00
4 changed files with 16 additions and 16 deletions
+1 -1
View File
@@ -138,7 +138,7 @@ npm start
http://localhost:8000/examples/
online example: http://react-component.github.io/slider/build/examples/
online example: http://react-component.github.io/slider/examples/
## Test Case
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "rc-slider",
"version": "1.2.5",
"version": "1.2.8",
"description": "slider ui component for react",
"keywords": [
"react",
+2 -2
View File
@@ -389,12 +389,12 @@ var Slider = React.createClass({
className = prefixClsFn(prefixCls, 'handle', 'handle-active');
}
var handle = <a className={className}
var handle = <div className={className}
ref = "handle"
style = {handleStyle}
href = "#"
onMouseDown = {this.handleMouseDown}
onTouchStart = {this.handleTouchStart}></a>;
onTouchStart = {this.handleTouchStart}></div>;
if (this.props.marks.length > 0) {
return handle;
+12 -12
View File
@@ -58,19 +58,19 @@ describe('rc-slider', function () {
expect(slider.getIndex()).to.be(3);
});
it('should mouseDown works!', function (done) {
var slider = React.render(
<Slider marks={["一","二","三","四","五"]} />,
div
);
var selectedStep = slider.refs.step3.getDOMNode();
// it('should mouseDown works!', function (done) {
// var slider = React.render(
// <Slider marks={["一","二","三","四","五"]} />,
// div
// );
// var selectedStep = slider.refs.step3.getDOMNode();
Simulate.mouseDown(selectedStep);
// Simulate.mouseDown(selectedStep);
setTimeout( function() {
expect(slider.state.active).to.be('active');
done();
}, 200);
});
// setTimeout( function() {
// expect(slider.state.active).to.be('active');
// done();
// }, 200);
// });
});