Skip to content

Commit eda8462

Browse files
committed
Merge pull request akiran#55 from vramana/cleanup-es6
Better formatting + ES6
2 parents d75e265 + fcc23c7 commit eda8462

File tree

12 files changed

+157
-114
lines changed

12 files changed

+157
-114
lines changed

.eslintrc

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"rules": {
3+
"no-extra-parens": 0,
4+
"react/jsx-uses-vars": 1,
5+
"global-strict": true,
6+
"quotes": [2, "single"],
7+
"no-underscore-dangle": false,
8+
"space-infix-ops": false,
9+
"no-alert": false
10+
},
11+
"ecmaFeatures": {
12+
"jsx": true,
13+
},
14+
"env": {
15+
"node": true,
16+
"browser": true,
17+
"es6": true,
18+
},
19+
"parser": "babel-eslint",
20+
"plugins": [
21+
"react"
22+
]
23+
}

docs/_style.scss

Lines changed: 39 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,64 @@
11
h3 {
2-
background:$primary-color;
2+
background: $primary-color;
33
color: #fff;
4-
font-size:36px;
5-
line-height:100px;
6-
margin:10px;
7-
padding:2%;
8-
position:relative;
9-
text-align:center;
4+
font-size: 36px;
5+
line-height: 100px;
6+
margin: 10px;
7+
padding: 2%;
8+
position: relative;
9+
text-align: center;
1010
}
1111
.variable-width .slick-slide p {
1212
background: $primary-color;
1313
height: 100px;
14-
color:#fff;
14+
color: #fff;
1515
margin: 5px;
1616
line-height: 100px;
1717
}
18-
.center .slick-center h3{
19-
color:#e67e22;
20-
opacity:1;
21-
transform:scale(1.08);
18+
.center .slick-center h3 {
19+
color: #e67e22;
20+
opacity: 1;
21+
transform: scale(1.08);
2222
}
2323
.center h3{
24-
opacity:0.8;transition:all 300ms ease;
24+
opacity: 0.8;
25+
transition: all 300ms ease;
2526
}
2627
.content {
27-
padding:20px;
28-
margin: auto;
28+
padding: 20px;
29+
margin: auto;
2930
width: 90%;
3031
}
31-
.slick-slide .image{
32-
padding:10px;
32+
.slick-slide .image {
33+
padding: 10px;
3334
}
3435
.slick-slide img{
35-
border:5px solid #FFF;
36-
display:block;
37-
width:100%;
36+
border: 5px solid #FFF;
37+
display: block;
38+
width: 100%;
3839
}
39-
.slick-slide img.slick-loading{
40-
border:0
40+
.slick-slide img.slick-loading {
41+
border: 0
4142
}
4243
.slick-slider{
43-
margin:30px auto 50px;
44+
margin: 30px auto 50px;
4445
}
4546
@media (max-width: 768px) {
46-
h3{font-size:24px;}
47-
.center{
48-
margin-left:-40px;
49-
margin-right:-40px;
47+
h3 {
48+
font-size:24px;
5049
}
51-
.center .slick-center h3{
52-
color:#e67e22;
53-
opacity:1;
54-
transform:scale(1);
50+
.center {
51+
margin-left: -40px;
52+
margin-right: -40px;
5553
}
56-
.center h3{
57-
opacity:0.8;
58-
transform:scale(0.95);
59-
transition:all 300ms ease;
54+
.center .slick-center h3 {
55+
color: #e67e22;
56+
opacity: 1;
57+
transform: scale(1);
6058
}
61-
}
59+
.center h3 {
60+
opacity: 0.8;
61+
transform: scale(0.95);
62+
transition: all 300ms ease;
63+
}
64+
}

docs/demos.jsx

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
var React = require('react');
24
var Slider = require('../');
35

@@ -8,7 +10,7 @@ var SingleItem = React.createClass({
810
infinite: true,
911
speed: 500,
1012
slidesToShow: 1,
11-
slidesToScroll: 1,
13+
slidesToScroll: 1
1214
};
1315
return (
1416
<div>
@@ -38,7 +40,7 @@ var MultipleItems = React.createClass({
3840
};
3941
return (
4042
<div>
41-
<h2> Multiple items </h2>
43+
<h2> Multiple items </h2>
4244
<Slider {...settings}>
4345
<div><h3>1</h3></div>
4446
<div><h3>2</h3></div>
@@ -84,7 +86,7 @@ var Responsive = React.createClass({
8486
slidesToScroll: 1
8587
}
8688
}]
87-
}
89+
};
8890
return (
8991
<div>
9092
<h2> Responsive </h2>
@@ -111,7 +113,7 @@ var UnevenSets = React.createClass({
111113
speed: 500,
112114
slidesToScroll: 4,
113115
slidesToShow: 4
114-
}
116+
};
115117
return (
116118
<div>
117119
<h2>Uneven sets</h2>
@@ -136,10 +138,11 @@ var CenterMode = React.createClass({
136138
infinite: true,
137139
centerPadding: '60px',
138140
slidesToShow: 3,
139-
speed: 500, afterChange:function(a){
140-
alert("Slider Changed to :"+a);
141+
speed: 500,
142+
afterChange: function (a) {
143+
alert('Slider Changed to :' + a);
141144
}
142-
}
145+
};
143146
return (
144147
<div>
145148
<h2>Center Mode</h2>
@@ -166,10 +169,11 @@ var CenterModeWithInitial = React.createClass({
166169
centerPadding: '60px',
167170
slidesToShow: 3,
168171
initialSlide: 3,
169-
speed: 500, afterChange:function(index){
170-
console.log('%c Slider Changed to:'+index, 'background: #222; color: #bada55');
172+
speed: 500,
173+
afterChange: function (index) {
174+
console.log(`%c Slider Changed to: + ${index}, background: #222; color: #bada55`);
171175
}
172-
}
176+
};
173177
return (
174178
<div>
175179
<h2>Center Mode With InitalSlideSet</h2>
@@ -195,8 +199,8 @@ var AutoPlay = React.createClass({
195199
slidesToShow: 3,
196200
slidesToScroll: 1,
197201
autoplay: true,
198-
autoplaySpeed: 2000,
199-
}
202+
autoplaySpeed: 2000
203+
};
200204
return (
201205
<div>
202206
<h2>Auto Play</h2>
@@ -223,7 +227,7 @@ var VariableWidth = React.createClass({
223227
slidesToShow: 1,
224228
slidesToScroll: 1,
225229
variableWidth: true
226-
}
230+
};
227231
return (
228232
<div>
229233
<h2>Variable width</h2>
@@ -249,7 +253,7 @@ var AdaptiveHeight = React.createClass({
249253
slidesToShow: 1,
250254
slidesToScroll: 1,
251255
adaptiveHeight: true
252-
}
256+
};
253257
return (
254258
<div>
255259
<h2>Adaptive height</h2>
@@ -298,4 +302,4 @@ var App = React.createClass({
298302
}
299303
});
300304

301-
module.exports = App;
305+
module.exports = App;

docs/docs.jsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
'use strict';
2+
13
var React = require('react');
24
var Demos = require('./demos');
35

docs/index.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
'use strict';
2+
13
var React = require('react');
24
var Router = require('react-router');
35
var routes = require('./routes');
46

57
React.initializeTouchEvents(true);
68
Router.run(routes, Router.HistoryLocation, function (Handler) {
79
React.render(<Handler />, document.getElementById('rapp'));
8-
});
10+
});

docs/routes.jsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1+
'use strict';
2+
13
var React = require('react');
24
var Router = require('react-router');
3-
var Route= Router.Route;
5+
var Route = Router.Route;
46
var Docs = require('./docs');
57

68
var path = (process.env.NODE_ENV === 'dev_docs') ? '/': '/opensource/react-slick';
79
var routes = (
810
<Route name='app' path={path} handler={Docs}>
9-
</Route>
11+
</Route>
1012
);
1113

1214
module.exports = routes;

lib/initial-state.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ var initialState = {
1212
slideCount: null,
1313
slideWidth: null,
1414
// sliding: false,
15-
// slideOffset: 0,
15+
// slideOffset: 0,
1616
swipeLeft: null,
1717
touchObject: {
1818
startX: 0,
1919
startY: 0,
2020
curX: 0,
2121
curY: 0
2222
},
23-
23+
2424
// added for react
2525
initialized: false,
2626
trackStyle: {},
@@ -36,4 +36,4 @@ var initialState = {
3636
// $slides: null,
3737
};
3838

39-
module.exports = initialState;
39+
module.exports = initialState;

lib/inner-slider.jsx

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"use strict";
1+
'use strict';
22

33
var React = require('react');
44
var cloneWithProps = require('react/lib/cloneWithProps');
@@ -29,7 +29,7 @@ var Slider = React.createClass({
2929
if (this.props.dots === true && this.state.slideCount > this.props.slidesToShow) {
3030
for (var i=0; i <= this.getDotCount(); i += 1) {
3131
var className = classnames({
32-
'slick-active': (this.state.currentSlide === i * this.props.slidesToScroll),
32+
'slick-active': (this.state.currentSlide === i * this.props.slidesToScroll)
3333
});
3434
dotOptions = {
3535
message: 'index',
@@ -58,7 +58,7 @@ var Slider = React.createClass({
5858
key: index,
5959
'data-index': index,
6060
className: this.getSlideClasses(index),
61-
style: _assign({}, this.getSlideStyle(), child.props.style),
61+
style: _assign({}, this.getSlideStyle(), child.props.style)
6262
}));
6363

6464
if (this.props.infinite === true) {
@@ -74,7 +74,7 @@ var Slider = React.createClass({
7474
key: key,
7575
'data-index': key,
7676
className: this.getSlideClasses(key),
77-
style: _assign({}, this.getSlideStyle(), child.props.style),
77+
style: _assign({}, this.getSlideStyle(), child.props.style)
7878
}));
7979
}
8080

@@ -84,7 +84,7 @@ var Slider = React.createClass({
8484
key: key,
8585
'data-index': key,
8686
className: this.getSlideClasses(key),
87-
style: _assign({}, this.getSlideStyle(), child.props.style),
87+
style: _assign({}, this.getSlideStyle(), child.props.style)
8888
}));
8989
}
9090
}
@@ -131,31 +131,33 @@ var Slider = React.createClass({
131131
var prevArrowProps = {
132132
key: '0',
133133
ref: 'previous',
134-
'data-role': "none",
134+
'data-role': 'none',
135135
className: classnames(prevClasses),
136136
style: {display: 'block'},
137137
onClick: prevHandler
138-
}
138+
};
139+
var prevArrow;
139140

140141
if (this.props.prevArrow) {
141-
var prevArrow = <this.props.prevArrow {...prevArrowProps} />;
142+
prevArrow = <this.props.prevArrow {...prevArrowProps} />;
142143
} else {
143-
var prevArrow = <button type="button" {...prevArrowProps}> Previous</button>;
144+
prevArrow = <button type="button" {...prevArrowProps}> Previous</button>;
144145
}
145146

146147
var nextArrowProps = {
147148
key: '1',
148149
ref: 'next',
149-
'data-role': "none",
150+
'data-role': 'none',
150151
className: classnames(nextClasses),
151152
style: {display: 'block'},
152153
onClick: nextHandler
153-
}
154+
};
155+
var nextArrow;
154156

155157
if (this.props.nextArrow) {
156-
var nextArrow = <this.props.nextArrow {...nextArrowProps} />;
158+
nextArrow = <this.props.nextArrow {...nextArrowProps} />;
157159
} else {
158-
var nextArrow = <button type="button" {...nextArrowProps}> Next</button>;
160+
nextArrow = <button type="button" {...nextArrowProps}> Next</button>;
159161
}
160162

161163
return [prevArrow, nextArrow];

0 commit comments

Comments
 (0)