update rc-tools rc-server npmignore gitignore

.gitignore

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

.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,19 +1,36 @@
 language: node_js
+
 notifications:
   email:
   - yiminghe@gmail.com
+
 node_js:
 - 0.12
-before_script:
+
-- npm start &
+before_install:
-- npm install mocha-phantomjs -g
+- |
-- phantomjs --version
+    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 browser-test
+    if [ "$TEST_TYPE" = test ]; then
-- npm run browser-test-cover
+      npm test
-- npm run saucelabs
+    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

@@ -5,6 +5,7 @@
 
 .@{prefixClass} {
   position: relative;
+  margin: 6px;
   height: 4px;
   width: 100%;
   border-radius: 2px;
@@ -56,7 +57,7 @@
     font-size: 12px;
     z-index: 3;
   }
-  
+
   &-mark-text {
     position: absolute;
     display: inline-block;

examples/simple.js

@@ -1,4 +1,3 @@
-/** @jsx React.DOM */
 // use jsx to render html, do not modify simple.html
 require('rc-slider/assets/index.css');
 var Slider = require('rc-slider');

index.js

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-slider",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "slider ui component for react",
   "keywords": [
     "react",
@@ -28,30 +28,29 @@
   },
   "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",
+    "start": "node --harmony node_modules/.bin/rc-server",
-    "publish": "spm publish && rc-tools run tag",
+    "publish": "rc-tools run tag",
     "lint": "rc-tools run lint",
-    "test": "",
+    "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
-    "saucelabs": "rc-tools run saucelabs",
+    "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
-    "browser-test": "rc-tools run browser-test",
+    "browser-test-cover": "node --harmony node_modules/.bin/rc-tools run browser-test-cover"
-    "browser-test-cover": "rc-tools run browser-test-cover"
   },
   "devDependencies": {
     "expect.js": "0.3.x",
-    "precommit-hook": "1.x",
+    "precommit-hook": "^1.0.7",
-    "rc-server": "2.x",
+    "rc-server": "3.x",
-    "rc-tools": "2.x",
+    "rc-tools": "3.x",
-    "react": "0.13.x",
+    "react": "^0.13.x",
     "node-dev": "2.x",
     "jquery": "^1.11.2",
     "css-loader": "^0.9.1"
   },
   "precommit": [
-    "lint",
+    "precommit"
-    "less"
   ],
   "dependencies": {
     "rc-util": "^2.0.2"

src/Slider.jsx

@@ -1,11 +1,12 @@
-/** @jsx React.DOM */
+'use strict';
+
 var React = require('react');
 var DomUtils = require('rc-util').Dom;
 
 function pauseEvent(e) {
   if (e.stopPropagation) {
     e.stopPropagation();
-  } 
+  }
   if (e.preventDefault) {
     e.preventDefault();
   }
@@ -88,8 +89,8 @@ var Slider = React.createClass({
 
   getIndex: function() {
     var props = this.props;
-    if (props.marks.length === 0) { 
+    if (props.marks.length === 0) {
-      return;
+      return 0;
     }
     var value = this.state.value;
     var unit = (props.max - props.min) / (props.marks.length - 1);
@@ -203,7 +204,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 +214,7 @@ var Slider = React.createClass({
 
     var sliderMin = rect.left;
     var sliderMax = rect.right;
-    
+
     this.setState({
       upperBound: slider.clientWidth,
       sliderLength: Math.abs(sliderMax - sliderMin),
@@ -238,7 +239,7 @@ var Slider = React.createClass({
       return;
     }
     var position = this._getMousePosition(e);
-    this._calValueByPos(position, 
+    this._calValueByPos(position,
       () => {
         this._triggerEvents('onChange');
         this._start(position);
@@ -268,7 +269,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>
       );
     }
 

tests/index.spec.js

@@ -1,4 +1,3 @@
-/** @jsx React.DOM */
 var expect = require('expect.js');
 var Slider = require('../index.js');
 var React = require('react');