This commit is contained in:
Benjy Cui
2016-03-22 17:35:05 +08:00
parent ac78842e48
commit 9b82f695c4
6 changed files with 48 additions and 45 deletions
+39 -36
View File
@@ -25689,7 +25689,7 @@
'use strict';
Object.defineProperty(exports, '__esModule', {
value: true
value: true
});
var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -25707,47 +25707,50 @@
var _classnames2 = _interopRequireDefault(_classnames);
var Marks = function Marks(_ref) {
var className = _ref.className;
var marks = _ref.marks;
var included = _ref.included;
var upperBound = _ref.upperBound;
var lowerBound = _ref.lowerBound;
var max = _ref.max;
var min = _ref.min;
var className = _ref.className;
var marks = _ref.marks;
var included = _ref.included;
var upperBound = _ref.upperBound;
var lowerBound = _ref.lowerBound;
var max = _ref.max;
var min = _ref.min;
var marksKeys = Object.keys(marks);
var marksCount = marksKeys.length;
var unit = 100 / (marksCount - 1);
var markWidth = unit * 0.9;
var marksKeys = Object.keys(marks);
var marksCount = marksKeys.length;
var unit = 100 / (marksCount - 1);
var markWidth = unit * 0.9;
var range = max - min;
var elements = marksKeys.map(parseFloat).sort(function (a, b) {
return a - b;
}).map(function (point) {
var _classNames;
var range = max - min;
var elements = marksKeys.map(parseFloat).sort(function (a, b) {
return a - b;
}).map(function (point) {
var _classNames;
var isActived = !included && point === upperBound || included && point <= upperBound && point >= lowerBound;
var markClassName = (0, _classnames2['default'])((_classNames = {}, _defineProperty(_classNames, className + '-text', true), _defineProperty(_classNames, className + '-text-active', isActived), _classNames));
var isActived = !included && point === upperBound || included && point <= upperBound && point >= lowerBound;
var markClassName = (0, _classnames2['default'])((_classNames = {}, _defineProperty(_classNames, className + '-text', true), _defineProperty(_classNames, className + '-text-active', isActived), _classNames));
var style = { width: markWidth + '%' };
style.left = (point - min) / range * 100 - markWidth / 2 + '%';
var style = {
width: markWidth + '%',
marginLeft: -markWidth / 2 + '%'
};
style.left = (point - min) / range * 100 + '%';
var markPoint = marks[point];
var markPointIsObject = typeof markPoint === 'object' && !_react2['default'].isValidElement(markPoint);
var markLabel = markPointIsObject ? markPoint.label : markPoint;
var markStyle = markPointIsObject ? _extends({}, style, markPoint.style) : style;
return _react2['default'].createElement(
'span',
{ className: markClassName, style: markStyle, key: point },
markLabel
);
});
var markPoint = marks[point];
var markPointIsObject = typeof markPoint === 'object' && !_react2['default'].isValidElement(markPoint);
var markLabel = markPointIsObject ? markPoint.label : markPoint;
var markStyle = markPointIsObject ? _extends({}, style, markPoint.style) : style;
return _react2['default'].createElement(
'span',
{ className: markClassName, style: markStyle, key: point },
markLabel
);
});
return _react2['default'].createElement(
'div',
{ className: className },
elements
);
return _react2['default'].createElement(
'div',
{ className: className },
elements
);
};
exports['default'] = Marks;
File diff suppressed because one or more lines are too long
+2 -2
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>marks.js - example - rc-slider@3.5.0</title>
<title>marks.js - example - rc-slider@3.5.1</title>
<meta name="viewport"
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
<meta charset="utf-8"/>
@@ -257,7 +257,7 @@ Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-lic
<body>
<div class="container">
<div class="header">
<h1>rc-slider@3.5.0</h1>
<h1>rc-slider@3.5.1</h1>
<p>slider ui component for react</p>
</div>
+2 -2
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>range.js - example - rc-slider@3.5.0</title>
<title>range.js - example - rc-slider@3.5.1</title>
<meta name="viewport"
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
<meta charset="utf-8"/>
@@ -257,7 +257,7 @@ Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-lic
<body>
<div class="container">
<div class="header">
<h1>rc-slider@3.5.0</h1>
<h1>rc-slider@3.5.1</h1>
<p>slider ui component for react</p>
</div>
+2 -2
View File
@@ -2,7 +2,7 @@
<html>
<head>
<title>slider.js - example - rc-slider@3.5.0</title>
<title>slider.js - example - rc-slider@3.5.1</title>
<meta name="viewport"
content="width=device-width,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
<meta charset="utf-8"/>
@@ -257,7 +257,7 @@ Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-lic
<body>
<div class="container">
<div class="header">
<h1>rc-slider@3.5.0</h1>
<h1>rc-slider@3.5.1</h1>
<p>slider ui component for react</p>
</div>
+2 -2
View File
@@ -7,7 +7,7 @@
<meta charset="utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<link href="//cdnjs.cloudflare.com/ajax/libs/normalize/3.0.3/normalize.css" rel="stylesheet"/>
<title>rc-slider@3.5.0 - slider ui component for react</title>
<title>rc-slider@3.5.1 - slider ui component for react</title>
<style>
@font-face {
font-family: octicons-anchor;
@@ -737,7 +737,7 @@
<body>
<div class="header">
<h1>rc-slider@3.5.0</h1>
<h1>rc-slider@3.5.1</h1>
</div>
<div class="examples">
<h3>EXAMPLES</h3>