Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.

Commit 3a09bd7

Browse files
committed
Merge pull request #35 from mesosphere/cleanup/DCOS-3192-polish-src-and-examples
Polish source and examples
2 parents c849495 + 3f0a73b commit 3a09bd7

File tree

11 files changed

+107
-109
lines changed

11 files changed

+107
-109
lines changed

docs/gulpTasks.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ gulp.task('docs:minify-js', ['docs:replace-js-strings'], function () {
6969
.pipe(gulp.dest(config.dirs.docs.distJS));
7070
});
7171

72-
gulp.task('docs:replace-js-strings', ['docs:webpack'], function() {
72+
gulp.task('docs:replace-js-strings', ['docs:webpack'], function () {
7373
return gulp.src(config.files.docs.distJS)
7474
.pipe(replace('@@VERSION', packageInfo.version))
7575
.pipe(gulp.dest(config.dirs.docs.distJS));
@@ -101,10 +101,10 @@ gulp.task('docs:webpack', ['docs:eslint'], function (callback) {
101101
// run webpack
102102
webpack(webpackConfig, function (err, stats) {
103103
if (err) {
104-
throw new gutil.PluginError("webpack", err);
104+
throw new gutil.PluginError('webpack', err);
105105
}
106106

107-
gutil.log("[webpack]", stats.toString({
107+
gutil.log('[webpack]', stats.toString({
108108
children: false,
109109
chunks: false,
110110
colors: true,

docs/src/Dropdown/index.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class DropdownExample extends React.Component {
1010
}
1111

1212
render() {
13-
var simpleList = [
13+
let simpleList = [
1414
{
1515
html: 'Foo',
1616
id: 'foo'
@@ -29,7 +29,7 @@ class DropdownExample extends React.Component {
2929
}
3030
];
3131

32-
var styledItemsList = [
32+
let styledItemsList = [
3333
{
3434
html:
3535
<span>
@@ -92,7 +92,7 @@ class DropdownExample extends React.Component {
9292
}
9393
];
9494

95-
var dividedList = [
95+
let dividedList = [
9696
{
9797
className: 'dropdown-menu-header',
9898
html: 'Foo',
@@ -133,7 +133,7 @@ class DropdownExample extends React.Component {
133133
}
134134
];
135135

136-
var variedDisplayText = [
136+
let variedDisplayText = [
137137
{
138138
html: 'Foo',
139139
id: 'foo',

docs/src/Table/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ class TableExample extends React.Component {
2121
}
2222

2323
getColumnHeading(prop, order, sortBy) {
24-
var caretClassNames = classNames({
24+
let caretClassNames = classNames({
2525
'caret': true,
2626
'caret--asc': order === 'asc',
2727
'caret--desc': order === 'desc',
2828
'caret--visible': sortBy.prop === prop
2929
});
3030

31-
var headingStrings = {
31+
let headingStrings = {
3232
'age': 'Age',
3333
'gender': 'Gender',
3434
'location': 'Location',
@@ -44,7 +44,7 @@ class TableExample extends React.Component {
4444
}
4545

4646
getColGroup(size) {
47-
var colGroup;
47+
let colGroup;
4848

4949
switch (size) {
5050
case 'large':
@@ -71,7 +71,7 @@ class TableExample extends React.Component {
7171
}
7272

7373
getColumns(size) {
74-
var columns;
74+
let columns;
7575

7676
switch (size) {
7777
case 'large':
@@ -127,7 +127,7 @@ class TableExample extends React.Component {
127127
}
128128

129129
getRows(size) {
130-
var rows;
130+
let rows;
131131

132132
switch (size) {
133133
case 'large':
@@ -213,7 +213,7 @@ class TableExample extends React.Component {
213213
}
214214

215215
render() {
216-
var buttonLabel;
216+
let buttonLabel;
217217

218218
if (this.state.rowAdded) {
219219
buttonLabel = 'Remove Row';

src/Dropdown/Dropdown.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import classNames from 'classnames';
33
import * as Util from '../Util/Util';
44
import * as DOMUtil from '../Util/DOMUtil';
55

6-
var CSSTransitionGroup = React.addons.CSSTransitionGroup;
6+
const CSSTransitionGroup = React.addons.CSSTransitionGroup;
77

88
export default class Dropdown extends React.Component {
99
constructor() {
@@ -29,7 +29,7 @@ export default class Dropdown extends React.Component {
2929
}
3030

3131
getSelectedHtml(id, items) {
32-
var obj = Util.find(items, function (item) {
32+
let obj = Util.find(items, function (item) {
3333
return item.id === id;
3434
});
3535

@@ -38,7 +38,7 @@ export default class Dropdown extends React.Component {
3838

3939
getMenuItems(items) {
4040
return items.map((item) => {
41-
var classSet = classNames(
41+
let classSet = classNames(
4242
{
4343
'is-selectable': item.selectable !== false,
4444
'is-selected': item.id === this.state.selectedID
@@ -47,7 +47,7 @@ export default class Dropdown extends React.Component {
4747
this.props.dropdownMenuListItemClassName
4848
);
4949

50-
var handleUserClick = null;
50+
let handleUserClick = null;
5151

5252
if (item.selectable !== false) {
5353
handleUserClick = this.handleItemClick.bind(this, item);
@@ -79,8 +79,8 @@ export default class Dropdown extends React.Component {
7979
}
8080

8181
handleWrapperBlur(e) {
82-
var elID = React.findDOMNode(this).dataset.reactid;
83-
var currentEl = e.relatedTarget;
82+
let elID = React.findDOMNode(this).dataset.reactid;
83+
let currentEl = e.relatedTarget;
8484

8585
// If the blur event fired from within the current dropdown, then the menu
8686
// needs to remain open. Otherwise it can safely be closed.
@@ -101,12 +101,12 @@ export default class Dropdown extends React.Component {
101101
}
102102

103103
render() {
104-
var dropdownStateClassSet = {
104+
let dropdownStateClassSet = {
105105
'open': this.state.isOpen
106106
};
107-
var dropdownMenu = null;
108-
var items = this.props.items;
109-
var wrapperClassSet = classNames(
107+
let dropdownMenu = null;
108+
let items = this.props.items;
109+
let wrapperClassSet = classNames(
110110
dropdownStateClassSet,
111111
this.props.wrapperClassName
112112
);

src/List/List.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react/addons';
1+
import React, {PropTypes} from 'react/addons';
22
import classNames from 'classnames';
33

44
import ListItem from './ListItem';
@@ -8,8 +8,8 @@ const CSSTransitionGroup = React.addons.CSSTransitionGroup;
88
export default class List extends React.Component {
99

1010
getListItems(list, childIndex = 0) {
11-
var items = list.map(function (item, parentIndex) {
12-
var key = `${parentIndex}.${childIndex}`;
11+
let items = list.map(function (item, parentIndex) {
12+
let key = `${parentIndex}.${childIndex}`;
1313
childIndex++;
1414

1515
if (item.items) {
@@ -40,15 +40,15 @@ export default class List extends React.Component {
4040
}
4141

4242
render() {
43-
var defaultClasses = [
43+
let defaultClasses = [
4444
'list'
4545
];
4646

47-
var classes = classNames(
47+
let classes = classNames(
4848
defaultClasses.concat(this.props.className.split(' '))
4949
);
5050

51-
var Tag = this.props.tag;
51+
let Tag = this.props.tag;
5252

5353
return (
5454
<Tag {...this.props} className={classes}>
@@ -68,10 +68,10 @@ List.defaultProps = {
6868
};
6969

7070
List.propTypes = {
71-
attributes: React.PropTypes.object,
72-
className: React.PropTypes.string,
73-
items: React.PropTypes.array.isRequired,
74-
tag: React.PropTypes.string,
75-
transition: React.PropTypes.bool,
76-
transitionName: React.PropTypes.string
71+
attributes: PropTypes.object,
72+
className: PropTypes.string,
73+
items: PropTypes.array.isRequired,
74+
tag: PropTypes.string,
75+
transition: PropTypes.bool,
76+
transitionName: PropTypes.string
7777
};

src/List/ListItem.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react';
1+
import React, {PropTypes} from 'react';
22
import classNames from 'classnames';
33

44
export default class ListItem extends React.Component {
@@ -32,8 +32,8 @@ ListItem.defaultProps = {
3232
};
3333

3434
ListItem.propTypes = {
35-
className: React.PropTypes.string,
36-
children: React.PropTypes.node,
37-
attributes: React.PropTypes.object,
38-
tag: React.PropTypes.string
35+
className: PropTypes.string,
36+
children: PropTypes.node,
37+
attributes: PropTypes.object,
38+
tag: PropTypes.string
3939
};

src/Modal/ModalContents.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React from 'react/addons';
1+
import React, {PropTypes} from 'react/addons';
22
import GeminiScrollbar from 'react-gemini-scrollbar';
33

44
import * as DOMUtil from '../Util/DOMUtil';
@@ -265,29 +265,29 @@ ModalContents.defaultProps = {
265265
};
266266

267267
ModalContents.propTypes = {
268-
children: React.PropTypes.node,
269-
closeByBackdropClick: React.PropTypes.bool,
270-
footer: React.PropTypes.object,
271-
maxHeightPercentage: React.PropTypes.number,
272-
onClose: React.PropTypes.func,
273-
open: React.PropTypes.bool,
274-
showCloseButton: React.PropTypes.bool,
275-
showFooter: React.PropTypes.bool,
276-
subHeader: React.PropTypes.node,
277-
titleText: React.PropTypes.string,
268+
children: PropTypes.node,
269+
closeByBackdropClick: PropTypes.bool,
270+
footer: PropTypes.object,
271+
maxHeightPercentage: PropTypes.number,
272+
onClose: PropTypes.func,
273+
open: PropTypes.bool,
274+
showCloseButton: PropTypes.bool,
275+
showFooter: PropTypes.bool,
276+
subHeader: PropTypes.node,
277+
titleText: PropTypes.string,
278278

279279
// Classes
280-
backdropClass: React.PropTypes.string,
281-
bodyClass: React.PropTypes.string,
282-
closeButtonClass: React.PropTypes.string,
283-
closeIconClass: React.PropTypes.string,
284-
closeTitleClass: React.PropTypes.string,
285-
containerClass: React.PropTypes.string,
286-
footerClass: React.PropTypes.string,
287-
footerContainerClass: React.PropTypes.string,
288-
headerClass: React.PropTypes.string,
289-
headerContainerClass: React.PropTypes.string,
290-
innerBodyClass: React.PropTypes.string,
291-
modalClass: React.PropTypes.string,
292-
titleClass: React.PropTypes.string
280+
backdropClass: PropTypes.string,
281+
bodyClass: PropTypes.string,
282+
closeButtonClass: PropTypes.string,
283+
closeIconClass: PropTypes.string,
284+
closeTitleClass: PropTypes.string,
285+
containerClass: PropTypes.string,
286+
footerClass: PropTypes.string,
287+
footerContainerClass: PropTypes.string,
288+
headerClass: PropTypes.string,
289+
headerContainerClass: PropTypes.string,
290+
innerBodyClass: PropTypes.string,
291+
modalClass: PropTypes.string,
292+
titleClass: PropTypes.string
293293
};

src/Portal/Portal.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import React from 'react/addons';
2-
3-
let PropTypes = React.PropTypes;
1+
import React, {PropTypes} from 'react/addons';
42

53
export default class Portal extends React.Component {
64
componentDidMount() {

src/SidePanel/SidePanelContents.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import classNames from 'classnames';
22
import GeminiScrollbar from 'react-gemini-scrollbar';
3-
import React from 'react/addons';
3+
import React, {PropTypes} from 'react/addons';
44

55
const CSSTransitionGroup = React.addons.CSSTransitionGroup;
66
const METHODS_TO_BIND = ['handleBackdropClick', 'closeSidePanel'];
77

8-
export default class SidePanel extends React.Component {
8+
export default class SidePanelContents extends React.Component {
99
constructor() {
1010
super();
1111

@@ -132,7 +132,7 @@ export default class SidePanel extends React.Component {
132132

133133
}
134134

135-
SidePanel.defaultProps = {
135+
SidePanelContents.defaultProps = {
136136
closeByBackdropClick: true,
137137
header: null,
138138
onClose: () => {},
@@ -147,18 +147,18 @@ SidePanel.defaultProps = {
147147
sidePanelClass: 'side-panel side-panel-large flex-container-col container container-pod container-pod-short flush-top'
148148
};
149149

150-
SidePanel.propTypes = {
151-
children: React.PropTypes.node,
152-
closeByBackdropClick: React.PropTypes.bool,
153-
header: React.PropTypes.node,
154-
onClose: React.PropTypes.func,
155-
open: React.PropTypes.bool,
150+
SidePanelContents.propTypes = {
151+
children: PropTypes.node,
152+
closeByBackdropClick: PropTypes.bool,
153+
header: PropTypes.node,
154+
onClose: PropTypes.func,
155+
open: PropTypes.bool,
156156

157157
// Classes
158-
backdropClass: React.PropTypes.string,
159-
bodyClass: React.PropTypes.string,
160-
containerClass: React.PropTypes.string,
161-
headerClass: React.PropTypes.string,
162-
headerContainerClass: React.PropTypes.string,
163-
sidePanelClass: React.PropTypes.string
158+
backdropClass: PropTypes.string,
159+
bodyClass: PropTypes.string,
160+
containerClass: PropTypes.string,
161+
headerClass: PropTypes.string,
162+
headerContainerClass: PropTypes.string,
163+
sidePanelClass: PropTypes.string
164164
};

0 commit comments

Comments
 (0)