Compare commits

...
1 Commits
Author SHA1 Message Date
simaQ 83e6e3a27e update rc-tools rc-server npmignore gitignore 2015-06-04 09:10:34 +08:00
9 changed files with 24 additions and 82 deletions
+2 -4
View File
@@ -19,10 +19,8 @@ Thumbs.db
*.pyo *.pyo
.build .build
node_modules node_modules
_site
sea-modules
spm_modules
.cache .cache
dist dist
assets/**/*.css assets/**/*.css
build/ build
lib
+6 -6
View File
@@ -1,7 +1,5 @@
bower_components/
build/ build/
*.cfg *.cfg
node_modules/
nohup.out nohup.out
*.iml *.iml
.idea/ .idea/
@@ -22,8 +20,10 @@ Thumbs.db
out/ out/
.build .build
node_modules node_modules
_site
sea-modules
spm_modules
.cache .cache
dist examples
tests
src
/index.js
.*
assets/**/*.less
+1
View File
@@ -5,6 +5,7 @@
.@{prefixClass} { .@{prefixClass} {
position: relative; position: relative;
margin: 6px;
height: 4px; height: 4px;
width: 100%; width: 100%;
border-radius: 2px; border-radius: 2px;
-1
View File
@@ -1,4 +1,3 @@
/** @jsx React.DOM */
// use jsx to render html, do not modify simple.html // use jsx to render html, do not modify simple.html
require('rc-slider/assets/index.css'); require('rc-slider/assets/index.css');
var Slider = require('rc-slider'); var Slider = require('rc-slider');
+1 -1
View File
@@ -1 +1 @@
module.exports = require('./lib/Slider'); module.exports = require('./src/Slider');
-56
View File
@@ -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;
+9 -9
View File
@@ -1,6 +1,6 @@
{ {
"name": "rc-slider", "name": "rc-slider",
"version": "1.0.0", "version": "1.1.1",
"description": "slider ui component for react", "description": "slider ui component for react",
"keywords": [ "keywords": [
"react", "react",
@@ -28,11 +28,12 @@
}, },
"scripts": { "scripts": {
"build": "rc-tools run build", "build": "rc-tools run build",
"precommit": "rc-tools run precommit",
"less": "rc-tools run less", "less": "rc-tools run less",
"gh-pages": "rc-tools run gh-pages", "gh-pages": "rc-tools run gh-pages",
"history": "rc-tools run history", "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", "lint": "rc-tools run lint",
"saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs", "saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
"browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test", "browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
@@ -40,17 +41,16 @@
}, },
"devDependencies": { "devDependencies": {
"expect.js": "0.3.x", "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", "node-dev": "2.x",
"jquery": "^1.11.2", "jquery": "^1.11.2",
"css-loader": "^0.9.1" "css-loader": "^0.9.1"
}, },
"precommit": [ "precommit": [
"lint", "precommit"
"less"
], ],
"dependencies": { "dependencies": {
"rc-util": "^2.0.2" "rc-util": "^2.0.2"
+5 -4
View File
@@ -1,4 +1,5 @@
/** @jsx React.DOM */ 'use strict';
var React = require('react'); var React = require('react');
var DomUtils = require('rc-util').Dom; var DomUtils = require('rc-util').Dom;
@@ -89,7 +90,7 @@ var Slider = React.createClass({
getIndex: function() { getIndex: function() {
var props = this.props; var props = this.props;
if (props.marks.length === 0) { if (props.marks.length === 0) {
return; return 0;
} }
var value = this.state.value; var value = this.state.value;
var unit = (props.max - props.min) / (props.marks.length - 1); var unit = (props.max - props.min) / (props.marks.length - 1);
@@ -203,7 +204,7 @@ var Slider = React.createClass({
value = newValue; value = newValue;
if (newValue !== oldValue) { 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'); className = prefixClsFn(prefixCls, 'dot', 'dot-active');
} }
elements[i] = ( elements[i] = (
<span className={className} style={style} ref={'step'+i}></span> <span className={className} style={style} ref={'step' + i}></span>
); );
} }
-1
View File
@@ -1,4 +1,3 @@
/** @jsx React.DOM */
var expect = require('expect.js'); var expect = require('expect.js');
var Slider = require('../index.js'); var Slider = require('../index.js');
var React = require('react'); var React = require('react');