Merge pull request #6 from react-component/fead-add-touch-support

为 handler 添加 touch 事件

.gitignore

@@ -19,10 +19,8 @@ Thumbs.db
 *.pyo
 .build
 node_modules
-_site
-sea-modules
-spm_modules
 .cache
 dist
 assets/**/*.css
-build/
+build
+lib

.jscsrc

@@ -1,27 +0,0 @@
-{
-    "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
-    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
-    "requireSpacesInFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "disallowSpacesInsideArrayBrackets": true,
-    "disallowSpacesInsideObjectBrackets": true,
-    "disallowSpacesInsideParentheses": true,
-    "disallowQuotedKeysInObjects": "allButReserved",
-    "disallowSpaceAfterObjectKeys": true,
-    "requireSpaceBeforeBinaryOperators": ["-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<=" ],
-    "requireSpacesInConditionalExpression": {
-        "afterTest": true,
-        "beforeConsequent": true,
-        "afterConsequent": true,
-        "beforeAlternate": true
-    },
-    "requireSpaceAfterBinaryOperators": ["/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
-    "disallowKeywords": [ "with" ],
-    "disallowSpaceAfterPrefixUnaryOperators": [ "!" , "++", "--", "+", "-", "~"],
-    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--", ","],
-    "disallowMultipleLineBreaks": true,
-    "disallowKeywordsOnNewLine": ["else"],
-    "safeContextKeyword": "self",
-    "excludeFiles": ["lib/**/parser.js"]
-}

.jshintrc

@@ -1,28 +0,0 @@
-{
-    "camelcase": true,
-    "curly": true,
-    "eqeqeq": true,
-    "freeze": true,
-    "indent": 4,
-    "latedef": "nofunc",
-    "quotmark": "false",
-    "nonew": true,
-    "newcap": false,
-    "immed": true,
-    "noarg": true,
-    "eqnull": true,
-    "trailing": true,
-    "undef": true,
-    "unused": true,
-    "browser": true,
-    "node": true,
-    "esnext": true,
-    "globals": {
-        "describe": false,
-        "expect": false,
-        "beforeEach": false,
-        "afterEach": false,
-        "modulex": false,
-        "it": false
-    }
-}

.npmignore

@@ -1,7 +1,5 @@
-bower_components/
 build/
 *.cfg
-node_modules/
 nohup.out
 *.iml
 .idea/
@@ -22,8 +20,10 @@ Thumbs.db
 out/
 .build
 node_modules
-_site
-sea-modules
-spm_modules
 .cache
-dist
+examples
+tests
+src
+/index.js
+.*
+assets/**/*.less

.travis.yml

@@ -1,14 +1,36 @@
 language: node_js
+
 notifications:
   email:
   - yiminghe@gmail.com
+
 node_js:
 - 0.12
-before_script:
-- npm start &
-- npm install mocha-phantomjs -g
-- phantomjs --version
+
+before_install:
+- |
+    if ! git diff --name-only $TRAVIS_COMMIT_RANGE | grep -qvE '(\.md$)|(^(docs|examples))/'
+    then
+      echo "Only docs were updated, stopping build process."
+      exit
+    fi
+    npm install mocha-phantomjs -g
+    phantomjs --version
+
 script:
-- npm test
-- npm run-script browser-test
-- npm run-script browser-test-cover
+- |
+    if [ "$TEST_TYPE" = test ]; then
+      npm test
+    else
+      npm run $TEST_TYPE
+    fi
+
+env:
+  matrix:
+  - TEST_TYPE=lint
+  - TEST_TYPE=browser-test
+  - TEST_TYPE=browser-test-cover
+  - TEST_TYPE=saucelabs
+  global:
+  - secure: S1VwbaPzLnSH/IUT/wlJulxAX5VHRIDmSt53h/ycHcZsszUpWcLCJRQAe0fTVB2dAx5MdBbSZ+o+tr3tRwVB5TRAYm0oTCsYAkOZaWOB28RuUQtdGt3wf9xxTG1UiPiaLLUW3waX9zAaf3yqKBcJGf1op0RD8dksxbCFw/7xVbU=
+  - secure: EBEDg8k///IlEsnx0AE8X3mbFl0QE5+xGKbG4AxXlGZda12uTIPUSMKJzdZQ2hVbZXduTzf1cQl9rcu9nGoSnkL/DWnIax9cvHi+1orx5+YPlxPHNWAwWByTnHosBn2MJhfy1s5paJfHC9cUzmmEL6x4fYthWxjsPUo+irEZH6E=

assets/index.less

@@ -3,8 +3,13 @@
 // color
 @disabledColor: #e7eaec;
 
+* {
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0); //remove tap highlight color for mobile safari
+}
+
 .@{prefixClass} {
   position: relative;
+  margin: 6px auto;
   height: 4px;
   width: 100%;
   border-radius: 2px;
@@ -25,7 +30,7 @@
     margin-top: -5px;
     width: 10px;
     height: 10px;
-    cursor: default;
+    cursor: pointer;
     border-radius: 50%;
     border: solid 2px #d9d9d9;
     background-color: #fff;
@@ -39,7 +44,7 @@
       &:active {
         border-color: #2db7f5;
         background-color: #2db7f5;
-        box-shadow: 0 0 0 5px rgba(45, 183, 245, .3);
+        box-shadow: 0 0 3px rgba(45, 183, 245, .75);
       }
       &:hover {
         border-color: #23c0fa;
@@ -56,7 +61,7 @@
     font-size: 12px;
     z-index: 3;
   }
-  
+
   &-mark-text {
     position: absolute;
     display: inline-block;

examples/simple.js

@@ -1,8 +1,8 @@
-/** @jsx React.DOM */
-// use jsx to render html, do not modify simple.html
+'use strict';
+
 require('rc-slider/assets/index.css');
 var Slider = require('rc-slider');
 var React = require('react');
-// React.render(<Sliders marks={["一","二","三","四","五"]} index={3}/>, document.getElementById('__react-content'));
+// React.render(<Slider marks={["一","二","三","四","五"]} index={3}/>, document.getElementById('__react-content'));
 // React.render(<Slider className='rc-slider' step={20}/>, document.getElementById('__react-content'));
 React.render(<Slider />, document.getElementById('__react-content'));

index.js

@@ -1 +1,3 @@
-module.exports = require('./lib/Slider');
+'use strict';
+
+module.exports = require('./src/');

lib/EventListener.js

@@ -1,56 +0,0 @@
-/**
- * Copyright 2013-2014 Facebook, Inc.
- *
- * This file contains a modified version of:
- * https://github.com/facebook/react/blob/v0.12.0/src/vendor/stubs/EventListener.js
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * TODO: remove in favour of solution provided by:
- *  https://github.com/facebook/react/issues/285
- */
-
-/**
- * Does not take into account specific nature of platform.
- */
-'use strict';
-
-var EventListener = {
-  /**
-   * Listen to DOM events during the bubble phase.
-   *
-   * @param {DOMEventTarget} target DOM element to register listener on.
-   * @param {string} eventType Event type, e.g. 'click' or 'mouseover'.
-   * @param {function} callback Callback function.
-   * @return {object} Object with a `remove` method.
-   */
-  listen: function listen(target, eventType, callback) {
-    if (target.addEventListener) {
-      target.addEventListener(eventType, callback, false);
-      return {
-        remove: function remove() {
-          target.removeEventListener(eventType, callback, false);
-        }
-      };
-    } else if (target.attachEvent) {
-      target.attachEvent('on' + eventType, callback);
-      return {
-        remove: function remove() {
-          target.detachEvent('on' + eventType, callback);
-        }
-      };
-    }
-  }
-};
-
-module.exports = EventListener;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.0.0",
+  "version": "1.2.3",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -18,39 +18,36 @@
     "url": "http://github.com/react-component/slider/issues"
   },
   "licenses": "MIT",
-  "spm": {
-    "dependencies": {
-      "react": "*"
-    }
-  },
-  "config":{
+  "main":"./lib/index.js",
+  "config": {
     "port": 8000
   },
   "scripts": {
     "build": "rc-tools run build",
+    "precommit": "rc-tools run precommit",
     "less": "rc-tools run less",
     "gh-pages": "rc-tools run gh-pages",
     "history": "rc-tools run history",
-    "start": "node-dev --harmony node_modules/.bin/rc-server",
-    "publish": "spm publish && rc-tools run tag",
+    "start": "node --harmony node_modules/.bin/rc-server",
+    "publish": "rc-tools run tag",
     "lint": "rc-tools run lint",
-    "test": "",
-    "saucelabs": "rc-tools run saucelabs",
-    "browser-test": "rc-tools run browser-test",
-    "browser-test-cover": "rc-tools run browser-test-cover"
+    "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
+    "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
+    "browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
   },
   "devDependencies": {
     "expect.js": "0.3.x",
-    "precommit-hook": "1.x",
-    "rc-server": "2.x",
-    "rc-tools": "2.x",
-    "react": "0.13.x",
-    "node-dev":"2.x",
-    "jquery": "^1.11.2",
-    "css-loader": "^0.9.1"
+    "precommit-hook": "^1.0.7",
+    "rc-server": "3.x",
+    "rc-tools": "3.x",
+    "react": "^0.13.x",
+    "node-dev": "2.x",
+    "jquery": "^1.11.2"
   },
   "precommit": [
-    "lint",
-    "less"
-  ]
+    "precommit"
+  ],
+  "dependencies": {
+    "rc-util": "^2.0.2"
+  }
 }

src/Slider.jsx

@@ -1,11 +1,12 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
-var EventListener = require('./EventListener');
+var DomUtils = require('rc-util').Dom;
 
 function pauseEvent(e) {
   if (e.stopPropagation) {
     e.stopPropagation();
-  } 
+  }
   if (e.preventDefault) {
     e.preventDefault();
   }
@@ -72,7 +73,7 @@ var Slider = React.createClass({
   },
 
   componentDidMount: function() {
-    this._onHandleResizeListener = EventListener.listen(window, 'resize', this.handleResize);
+    this._onHandleResizeListener = DomUtils.addEventListener(window, 'resize', this.handleResize);
     this.handleResize();
   },
 
@@ -88,8 +89,8 @@ var Slider = React.createClass({
 
   getIndex: function() {
     var props = this.props;
-    if (props.marks.length === 0) { 
-      return;
+    if (props.marks.length === 0) {
+      return 0;
     }
     var value = this.state.value;
     var unit = (props.max - props.min) / (props.marks.length - 1);
@@ -141,6 +142,11 @@ var Slider = React.createClass({
     return e.pageX || (e.clientX + document.documentElement.scrollLeft);
   },
 
+  _getTouchPosition: function (e) {
+    var touch = e.touches[0];
+    return touch.pageX;
+  },
+
   _triggerEvents: function(event) {
     var props = this.props;
     var hasMarks = props.marks && props.marks.length > 0;
@@ -149,17 +155,27 @@ var Slider = React.createClass({
     }
   },
 
-  _addEventHandles: function() {
-    this._onMouseMoveListener = EventListener.listen(document, 'mousemove', this._onMouseMove);
-    this._onMouseUpListener = EventListener.listen(document, 'mouseup', this._onMouseUp);
-  },
-
-  _removeEventHandles: function () {
-    if (this._onMouseMoveListener) {
-      this._onMouseMoveListener.remove();
+  _addEventHandles: function(type) {
+    if (type === 'touch') {
+      // just work for chrome iOS Safari and Android Browser
+      this._onTouchMoveListener = DomUtils.addEventListener(document, 'touchmove', this._onTouchMove);
+      this._onTouchUpListener = DomUtils.addEventListener(document, 'touchend', this._onTouchUp);
     }
 
-    if (this._onMouseUpListener) {
+    if (type === 'mouse') {
+      this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove);
+      this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp);
+    }
+  },
+
+  _removeEventHandles: function (type) {
+    if (type === 'touch') {
+      this._onTouchMoveListener.remove();
+      this._onTouchUpListener.remove();
+    }
+
+    if (type === 'mouse') {
+      this._onMouseMoveListener.remove();
       this._onMouseUpListener.remove();
     }
   },
@@ -177,18 +193,37 @@ var Slider = React.createClass({
     });
   },
 
-  _end: function() {
-    this._removeEventHandles();
+  _end: function(type) {
+    this._removeEventHandles(type);
     this.setState(this._triggerEvents.bind(this, 'onAfterChange'));
   },
 
   _onMouseUp: function() {
-    this._end();
+    this._end('mouse');
+  },
+
+  _onTouchUp: function() {
+    this._end('touch');
   },
 
   _onMouseMove: function(e) {
-    pauseEvent(e);
     var position = this._getMousePosition(e);
+    this._handleMove(e, position);
+  },
+
+  _onTouchMove: function(e) {
+    if (e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
+      return;
+    }
+
+    var position = this._getTouchPosition(e);
+
+    this._handleMove(e, position);
+  },
+
+  _handleMove: function(e, position) {
+    pauseEvent(e);
+    // var position = this._getMousePosition(e);
     var props = this.props;
     var state = this.state;
 
@@ -203,7 +238,7 @@ var Slider = React.createClass({
     value = newValue;
 
     if (newValue !== oldValue) {
-      this.setState({value: value, active: 'active'} ,this._triggerEvents.bind(this, 'onChange'));
+      this.setState({value: value, active: 'active'}, this._triggerEvents.bind(this, 'onChange'));
     }
   },
 
@@ -213,7 +248,7 @@ var Slider = React.createClass({
 
     var sliderMin = rect.left;
     var sliderMax = rect.right;
-    
+
     this.setState({
       upperBound: slider.clientWidth,
       sliderLength: Math.abs(sliderMax - sliderMin),
@@ -221,6 +256,18 @@ var Slider = React.createClass({
     });
   },
 
+  handleTouchStart: function(e) {
+    if (this.props.disabled || e.touches.length > 1 || (e.type === 'touchend' && e.touches.length > 0)) {
+      return;
+    }
+
+    var position = this._getTouchPosition(e);
+    this.startPosition = position;
+    this._start(position);
+    this._addEventHandles('touch');
+    pauseEvent(e);
+  },
+
   handleMouseDown: function() {
     return (e) => {
       if (this.props.disabled) {
@@ -228,7 +275,7 @@ var Slider = React.createClass({
       }
       var position = this._getMousePosition(e);
       this._start(position);
-      this._addEventHandles();
+      this._addEventHandles('mouse');
       pauseEvent(e);
     };
   },
@@ -238,11 +285,11 @@ var Slider = React.createClass({
       return;
     }
     var position = this._getMousePosition(e);
-    this._calValueByPos(position, 
+    this._calValueByPos(position,
       () => {
         this._triggerEvents('onChange');
         this._start(position);
-        this._addEventHandles();
+        this._addEventHandles('mouse');
       }
     );
     pauseEvent(e);
@@ -268,7 +315,7 @@ var Slider = React.createClass({
         className = prefixClsFn(prefixCls, 'dot', 'dot-active');
       }
       elements[i] = (
-        <span className={className} style={style} ref={'step'+i}></span>
+        <span className={className} style={style} ref={'step' + i}></span>
       );
     }
 
@@ -320,7 +367,7 @@ var Slider = React.createClass({
     var className = prefixClsFn(prefixCls, 'mark');
 
     return (
-      <div className={className} onMouseDown={this.handleSliderMouseDown}>
+      <div className={className}>
         {elements}
       </div>
     );
@@ -343,7 +390,8 @@ var Slider = React.createClass({
         ref = "handle"
         style = {handleStyle}
         href = "#"
-        onMouseDown={this.handleMouseDown}></a>
+        onMouseDown = {this.handleMouseDown}
+        onTouchStart = {this.handleTouchStart}></a>
     );
   },
 

src/index.js

@@ -0,0 +1,3 @@
+'use strict';
+
+module.exports = require('./Slider');

tests/index.spec.js

@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
 var expect = require('expect.js');
 var Slider = require('../index.js');
 var React = require('react');
@@ -72,4 +73,4 @@ describe('rc-slider', function () {
     }, 200);
   });
 
-});
+});