From 8645e8dc683ce4f96354fbbe099870b381917bee Mon Sep 17 00:00:00 2001 From: simaQ Date: Thu, 23 Apr 2015 10:23:30 +0800 Subject: [PATCH 1/3] add rc-util --- lib/EventListener.js | 56 -------------------------------------------- lib/Slider.js | 8 +++---- package.json | 9 ++++--- 3 files changed, 10 insertions(+), 63 deletions(-) delete mode 100644 lib/EventListener.js 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/lib/Slider.js b/lib/Slider.js index 5c92e6f..27a6a0e 100644 --- a/lib/Slider.js +++ b/lib/Slider.js @@ -1,6 +1,6 @@ /** @jsx React.DOM */ var React = require('react'); -var EventListener = require('./EventListener'); +var DomUtils = require('rc-util').Dom; function pauseEvent(e) { if (e.stopPropagation) { @@ -72,7 +72,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(); }, @@ -150,8 +150,8 @@ var Slider = React.createClass({ }, _addEventHandles: function() { - this._onMouseMoveListener = EventListener.listen(document, 'mousemove', this._onMouseMove); - this._onMouseUpListener = EventListener.listen(document, 'mouseup', this._onMouseUp); + this._onMouseMoveListener = DomUtils.addEventListener(document, 'mousemove', this._onMouseMove); + this._onMouseUpListener = DomUtils.addEventListener(document, 'mouseup', this._onMouseUp); }, _removeEventHandles: function () { diff --git a/package.json b/package.json index 1e819f1..e24d04e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "react": "*" } }, - "config":{ + "config": { "port": 8000 }, "scripts": { @@ -45,12 +45,15 @@ "rc-server": "2.x", "rc-tools": "2.x", "react": "0.13.x", - "node-dev":"2.x", + "node-dev": "2.x", "jquery": "^1.11.2", "css-loader": "^0.9.1" }, "precommit": [ "lint", "less" - ] + ], + "dependencies": { + "rc-util": "^2.0.2" + } } From bf993350c1fbd5ce5760a6ae20bd681b4ed481de Mon Sep 17 00:00:00 2001 From: simaQ Date: Thu, 23 Apr 2015 19:51:32 +0800 Subject: [PATCH 2/3] optimize: remove redundant event on mark --- examples/simple.js | 2 +- lib/Slider.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/simple.js b/examples/simple.js index 29b1b4e..13aa1df 100644 --- a/examples/simple.js +++ b/examples/simple.js @@ -3,6 +3,6 @@ require('rc-slider/assets/index.css'); var Slider = require('rc-slider'); var React = require('react'); -// React.render(, document.getElementById('__react-content')); +// React.render(, document.getElementById('__react-content')); // React.render(, document.getElementById('__react-content')); React.render(, document.getElementById('__react-content')); diff --git a/lib/Slider.js b/lib/Slider.js index 27a6a0e..079ad48 100644 --- a/lib/Slider.js +++ b/lib/Slider.js @@ -320,7 +320,7 @@ var Slider = React.createClass({ var className = prefixClsFn(prefixCls, 'mark'); return ( -
+
{elements}
); From 2e54dbf4a5a2b9d70760c02fdaaf7c33eea2f2a7 Mon Sep 17 00:00:00 2001 From: simaQ Date: Wed, 13 May 2015 17:29:46 +0800 Subject: [PATCH 3/3] style: update style --- assets/index.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/index.less b/assets/index.less index d3f0c32..cd4edd4 100644 --- a/assets/index.less +++ b/assets/index.less @@ -39,7 +39,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;