mirror of
https://github.com/wassname/slider.git
synced 2026-09-10 12:38:09 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a49a3d35aa | ||
|
|
e6261f28a8 | ||
|
|
0f2f13eecb | ||
|
|
af89f92d58 | ||
|
|
83e6e3a27e |
+2
-4
@@ -19,10 +19,8 @@ Thumbs.db
|
||||
*.pyo
|
||||
.build
|
||||
node_modules
|
||||
_site
|
||||
sea-modules
|
||||
spm_modules
|
||||
.cache
|
||||
dist
|
||||
assets/**/*.css
|
||||
build/
|
||||
build
|
||||
lib
|
||||
@@ -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"]
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
+6
-6
@@ -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
|
||||
@@ -5,6 +5,7 @@
|
||||
|
||||
.@{prefixClass} {
|
||||
position: relative;
|
||||
margin: 6px;
|
||||
height: 4px;
|
||||
width: 100%;
|
||||
border-radius: 2px;
|
||||
|
||||
+2
-2
@@ -1,5 +1,5 @@
|
||||
/** @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');
|
||||
|
||||
@@ -1 +1,3 @@
|
||||
module.exports = require('./lib/Slider');
|
||||
'use strict';
|
||||
|
||||
module.exports = require('./src/');
|
||||
|
||||
@@ -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;
|
||||
+11
-16
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "rc-slider",
|
||||
"version": "1.0.0",
|
||||
"version": "1.2.2",
|
||||
"description": "slider ui component for react",
|
||||
"keywords": [
|
||||
"react",
|
||||
@@ -18,21 +18,18 @@
|
||||
"url": "http://github.com/react-component/slider/issues"
|
||||
},
|
||||
"licenses": "MIT",
|
||||
"spm": {
|
||||
"dependencies": {
|
||||
"react": "*"
|
||||
}
|
||||
},
|
||||
"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",
|
||||
"saucelabs": "node --harmony node_modules/.bin/rc-tools run saucelabs",
|
||||
"browser-test": "node --harmony node_modules/.bin/rc-tools run browser-test",
|
||||
@@ -40,17 +37,15 @@
|
||||
},
|
||||
"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"
|
||||
"jquery": "^1.11.2"
|
||||
},
|
||||
"precommit": [
|
||||
"lint",
|
||||
"less"
|
||||
"precommit"
|
||||
],
|
||||
"dependencies": {
|
||||
"rc-util": "^2.0.2"
|
||||
|
||||
@@ -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] = (
|
||||
<span className={className} style={style} ref={'step'+i}></span>
|
||||
<span className={className} style={style} ref={'step' + i}></span>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = require('./Slider');
|
||||
+3
-2
@@ -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);
|
||||
});
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user