Compare commits

...
1 Commits
Author SHA1 Message Date
yiminghe df97e41d48 update deps 2015-11-10 23:25:43 +08:00
4 changed files with 24 additions and 29 deletions
+2 -2
View File
@@ -146,7 +146,7 @@
display: none; display: none;
} }
&-placement-points-bc-tc { &-placement-top {
padding: @tooltip-arrow-width 0 @tooltip-distance 0; padding: @tooltip-arrow-width 0 @tooltip-distance 0;
} }
@@ -172,7 +172,7 @@
border-style: solid; border-style: solid;
} }
&-placement-points-bc-tc &-arrow { &-placement-top &-arrow {
bottom: @tooltip-distance - @tooltip-arrow-width; bottom: @tooltip-distance - @tooltip-arrow-width;
left: 50%; left: 50%;
margin-left: -@tooltip-arrow-width; margin-left: -@tooltip-arrow-width;
+5 -5
View File
@@ -1,6 +1,6 @@
{ {
"name": "rc-slider", "name": "rc-slider",
"version": "2.0.1", "version": "2.1.0",
"description": "slider ui component for react", "description": "slider ui component for react",
"keywords": [ "keywords": [
"react", "react",
@@ -40,18 +40,18 @@
"devDependencies": { "devDependencies": {
"expect.js": "0.3.x", "expect.js": "0.3.x",
"jquery": "^1.11.2", "jquery": "^1.11.2",
"precommit-hook": "^1.0.7", "pre-commit": "1.x",
"rc-server": "3.x", "rc-server": "3.x",
"rc-tools": "4.x", "rc-tools": "4.x",
"react": "~0.14.0", "react": "~0.14.0",
"react-addons-test-utils": "^0.14.0", "react-addons-test-utils": "^0.14.0",
"react-dom": "~0.14.0" "react-dom": "~0.14.0"
}, },
"precommit": [ "pre-commit": [
"lint" "lint"
], ],
"dependencies": { "dependencies": {
"rc-tooltip": "~3.0.4", "rc-tooltip": "3.x",
"rc-util": "2.x" "rc-util": "3.x"
} }
} }
+1 -1
View File
@@ -40,7 +40,7 @@ export default class Handle extends React.Component {
const isTooltipVisible = dragging || this.state.isTooltipVisible; const isTooltipVisible = dragging || this.state.isTooltipVisible;
return (<Tooltip return (<Tooltip
prefixCls={className.replace('handle', 'tooltip')} prefixCls={className.replace('handle', 'tooltip')}
placement={{points: ['bc', 'tc']}} placement="top"
visible={isTooltipVisible} visible={isTooltipVisible}
overlay={<span>{value}</span>} overlay={<span>{value}</span>}
delay={0} delay={0}
+16 -21
View File
@@ -1,11 +1,12 @@
import React from 'react'; 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 Track from './Track';
import Handle from './Handle'; import Handle from './Handle';
import Steps from './Steps'; import Steps from './Steps';
import Marks from './Marks'; import Marks from './Marks';
function noop() {} function noop() {
}
function isNotTouchEvent(e) { function isNotTouchEvent(e) {
return e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0); return e.touches.length > 1 || (e.type.toLowerCase() === 'touchend' && e.touches.length > 0);
@@ -16,18 +17,12 @@ function getTouchPosition(e) {
} }
function getMousePosition(e) { function getMousePosition(e) {
return e.pageX || (e.clientX + document.documentElement.scrollLeft); // to compat ie8 return e.pageX;
} }
function pauseEvent(e) { function pauseEvent(e) {
e.cancelBubble = true; e.stopPropagation();
e.returnValue = false; e.preventDefault();
if (e.stopPropagation) {
e.stopPropagation();
}
if (e.preventDefault) {
e.preventDefault();
}
} }
class Slider extends React.Component { class Slider extends React.Component {
@@ -324,7 +319,7 @@ class Slider extends React.Component {
end(type) { end(type) {
this.removeEventons(type); this.removeEventons(type);
this.triggerEvents('onAfterChange'); this.triggerEvents('onAfterChange');
this.setState({ handle: null }); this.setState({handle: null});
} }
render() { render() {
@@ -334,7 +329,7 @@ class Slider extends React.Component {
const {marks, step, max, min, tipTransitionName, children} = props; const {marks, step, max, min, tipTransitionName, children} = props;
const marksLen = marks.length; const marksLen = marks.length;
const sliderClassName = rcUtil.classSet({ const sliderClassName = classSet({
[prefixCls]: true, [prefixCls]: true,
[prefixCls + '-disabled']: disabled, [prefixCls + '-disabled']: disabled,
[className]: !!className, [className]: !!className,
@@ -346,18 +341,18 @@ class Slider extends React.Component {
let track = null; let track = null;
if ((included && isIncluded) || range) { if ((included && isIncluded) || range) {
const trackClassName = prefixCls + '-track'; const trackClassName = prefixCls + '-track';
track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset} />; track = <Track className={trackClassName} offset={lowerOffset} length={upperOffset - lowerOffset}/>;
} }
const handleClassName = prefixCls + '-handle'; const handleClassName = prefixCls + '-handle';
const isNoTip = marksLen > 0; const isNoTip = marksLen > 0;
const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} const upper = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'} />); offset={upperOffset} value={upperBound} dragging={handle === 'upperBound'}/>);
let lower = null; let lower = null;
if (range) { if (range) {
lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip} lower = (<Handle className={handleClassName} tipTransitionName={tipTransitionName} noTip={isNoTip}
offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'} />); offset={lowerOffset} value={lowerBound} dragging={handle === 'lowerBound'}/>);
} }
const upperIndex = this.getIndex(upperBound); const upperIndex = this.getIndex(upperBound);
@@ -367,21 +362,21 @@ class Slider extends React.Component {
const stepsClassName = prefixCls + '-step'; const stepsClassName = prefixCls + '-step';
const stepNum = marksLen > 0 ? marksLen : Math.floor((max - min) / step) + 1; const stepNum = marksLen > 0 ? marksLen : Math.floor((max - min) / step) + 1;
steps = (<Steps className={stepsClassName} stepNum={stepNum} steps = (<Steps className={stepsClassName} stepNum={stepNum}
lowerIndex={this.getIndex(lowerBound)} upperIndex={upperIndex} lowerIndex={this.getIndex(lowerBound)} upperIndex={upperIndex}
included={(included && isIncluded) || range} />); included={(included && isIncluded) || range}/>);
} }
let mark = null; let mark = null;
if (marksLen > 0) { if (marksLen > 0) {
const markClassName = prefixCls + '-mark'; const markClassName = prefixCls + '-mark';
mark = (<Marks className={markClassName} marks={marks} mark = (<Marks className={markClassName} marks={marks}
index={upperIndex} included={(included && isIncluded)} />); index={upperIndex} included={(included && isIncluded)}/>);
} }
return ( return (
<div ref="slider" className={sliderClassName} <div ref="slider" className={sliderClassName}
onTouchStart={disabled ? noop : this.onTouchStart.bind(this)} onTouchStart={disabled ? noop : this.onTouchStart.bind(this)}
onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}> onMouseDown={disabled ? noop : this.onSliderMouseDown.bind(this)}>
{track} {track}
{upper} {upper}
{lower} {lower}