From df97e41d4822759f949506591365ee526f50f6da Mon Sep 17 00:00:00 2001 From: yiminghe Date: Tue, 10 Nov 2015 23:25:43 +0800 Subject: [PATCH] update deps --- assets/index.less | 4 ++-- package.json | 10 +++++----- src/Handle.jsx | 2 +- src/Slider.jsx | 37 ++++++++++++++++--------------------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/assets/index.less b/assets/index.less index 56333a5..8e81e1f 100644 --- a/assets/index.less +++ b/assets/index.less @@ -146,7 +146,7 @@ display: none; } - &-placement-points-bc-tc { + &-placement-top { padding: @tooltip-arrow-width 0 @tooltip-distance 0; } @@ -172,7 +172,7 @@ border-style: solid; } - &-placement-points-bc-tc &-arrow { + &-placement-top &-arrow { bottom: @tooltip-distance - @tooltip-arrow-width; left: 50%; margin-left: -@tooltip-arrow-width; diff --git a/package.json b/package.json index bb5adf9..bf625d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-slider", - "version": "2.0.1", + "version": "2.1.0", "description": "slider ui component for react", "keywords": [ "react", @@ -40,18 +40,18 @@ "devDependencies": { "expect.js": "0.3.x", "jquery": "^1.11.2", - "precommit-hook": "^1.0.7", + "pre-commit": "1.x", "rc-server": "3.x", "rc-tools": "4.x", "react": "~0.14.0", "react-addons-test-utils": "^0.14.0", "react-dom": "~0.14.0" }, - "precommit": [ + "pre-commit": [ "lint" ], "dependencies": { - "rc-tooltip": "~3.0.4", - "rc-util": "2.x" + "rc-tooltip": "3.x", + "rc-util": "3.x" } } diff --git a/src/Handle.jsx b/src/Handle.jsx index 3869059..f9dfbae 100644 --- a/src/Handle.jsx +++ b/src/Handle.jsx @@ -40,7 +40,7 @@ export default class Handle extends React.Component { const isTooltipVisible = dragging || this.state.isTooltipVisible; return ({value}} delay={0} diff --git a/src/Slider.jsx b/src/Slider.jsx index e312fed..ff69e4c 100644 --- a/src/Slider.jsx +++ b/src/Slider.jsx @@ -1,11 +1,12 @@ import React from 'react'; -import rcUtil, {Dom as DomUtils} from 'rc-util'; +import {Dom as DomUtils, classSet} from 'rc-util'; import Track from './Track'; import Handle from './Handle'; import Steps from './Steps'; import Marks from './Marks'; -function noop() {} +function noop() { +} function isNotTouchEvent(e) { return e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0); @@ -16,18 +17,12 @@ function getTouchPosition(e) { } function getMousePosition(e) { - return e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8 + return e.pageX; } function pauseEvent(e) { - e.cancelBubble = true; - e.returnValue = false; - if (e.stopPropagation) { - e.stopPropagation(); - } - if (e.preventDefault) { - e.preventDefault(); - } + e.stopPropagation(); + e.preventDefault(); } class Slider extends React.Component { @@ -324,7 +319,7 @@ class Slider extends React.Component { end(type) { this.removeEventons(type); this.triggerEvents('onAfterChange'); - this.setState({ handle: null }); + this.setState({handle: null}); } render() { @@ -334,7 +329,7 @@ class Slider extends React.Component { const {marks, step, max, min, tipTransitionName, children} = props; const marksLen = marks.length; - const sliderClassName = rcUtil.classSet({ + const sliderClassName = classSet({ [prefixCls]: true, [prefixCls + '-disabled']: disabled, [className]: !!className, @@ -346,18 +341,18 @@ class Slider extends React.Component { let track = null; if ((included && isIncluded) || range) { const trackClassName = prefixCls + '-track'; - track = ; + track = ; } const handleClassName = prefixCls + '-handle'; const isNoTip = marksLen > 0; const upper = (); + offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>); let lower = null; if (range) { lower = (); + offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>); } const upperIndex = this.getIndex(upperBound); @@ -367,21 +362,21 @@ class Slider extends React.Component { const stepsClassName = prefixCls + '-step'; const stepNum = marksLen > 0 ? marksLen : Math.floor((max - min) / step) + 1; steps = (); + lowerIndex={this.getIndex(lowerBound)} upperIndex={upperIndex} + included={(included && isIncluded) || range}/>); } let mark = null; if (marksLen > 0) { const markClassName = prefixCls + '-mark'; mark = (); + index={upperIndex} included={(included && isIncluded)}/>); } return (
+ onTouchStart={disabled ? noop : this.onTouchStart.bind(this)} + onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}> {track} {upper} {lower}