diff --git a/.gitignore b/.gitignore
index f8d8a67..f67c8b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,8 @@ Thumbs.db
*.pyo
.build
node_modules
-_site
-sea-modules
-spm_modules
.cache
dist
assets/**/*.css
-build/
\ No newline at end of file
+build
+lib
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index e43e0f4..8db6ebd 100644
--- a/.npmignore
+++ b/.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
\ No newline at end of file
+examples
+tests
+src
+/index.js
+.*
+assets/**/*.less
\ No newline at end of file
diff --git a/assets/index.less b/assets/index.less
index 7eeb3c6..fbf302b 100644
--- a/assets/index.less
+++ b/assets/index.less
@@ -5,6 +5,7 @@
.@{prefixClass} {
position: relative;
+ margin: 6px;
height: 4px;
width: 100%;
border-radius: 2px;
diff --git a/examples/simple.js b/examples/simple.js
index 13aa1df..d407c66 100644
--- a/examples/simple.js
+++ b/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');
diff --git a/index.js b/index.js
index de274eb..6a46c6d 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-module.exports = require('./lib/Slider');
+module.exports = require('./src/Slider');
diff --git a/lib/EventListener.js b/lib/EventListener.js
deleted file mode 100644
index f8c9c23..0000000
--- a/lib/EventListener.js
+++ /dev/null
@@ -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;
diff --git a/package.json b/package.json
index d2f39df..eaefe77 100644
--- a/package.json
+++ b/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,11 +28,12 @@
},
"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",
"saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
"browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
@@ -40,17 +41,16 @@
},
"devDependencies": {
"expect.js": "0.3.x",
- "precommit-hook": "1.x",
- "rc-server": "2.x",
- "rc-tools": "2.x",
- "react": "0.13.x",
+ "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",
"css-loader": "^0.9.1"
},
"precommit": [
- "lint",
- "less"
+ "precommit"
],
"dependencies": {
"rc-util": "^2.0.2"
diff --git a/lib/Slider.jsx b/src/Slider.jsx
similarity index 98%
rename from lib/Slider.jsx
rename to src/Slider.jsx
index 4d060fd..4a473f2 100644
--- a/lib/Slider.jsx
+++ b/src/Slider.jsx
@@ -1,4 +1,5 @@
-/** @jsx React.DOM */
+'use strict';
+
var React = require('react');
var DomUtils = require('rc-util').Dom;
@@ -89,7 +90,7 @@ var Slider = React.createClass({
getIndex: function() {
var props = this.props;
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'));
}
},
@@ -268,7 +269,7 @@ var Slider = React.createClass({
className = prefixClsFn(prefixCls, 'dot', 'dot-active');
}
elements[i] = (
-
+
);
}
diff --git a/tests/index.spec.js b/tests/index.spec.js
index 87d094b..b740dab 100644
--- a/tests/index.spec.js
+++ b/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');