Skip to content
This repository was archived by the owner on Oct 23, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/gulpTasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ gulp.task('docs:minify-js', ['docs:replace-js-strings'], function () {
.pipe(gulp.dest(config.dirs.docs.distJS));
});

gulp.task('docs:replace-js-strings', ['docs:webpack'], function() {
gulp.task('docs:replace-js-strings', ['docs:webpack'], function () {
return gulp.src(config.files.docs.distJS)
.pipe(replace('@@VERSION', packageInfo.version))
.pipe(gulp.dest(config.dirs.docs.distJS));
Expand Down Expand Up @@ -101,10 +101,10 @@ gulp.task('docs:webpack', ['docs:eslint'], function (callback) {
// run webpack
webpack(webpackConfig, function (err, stats) {
if (err) {
throw new gutil.PluginError("webpack", err);
throw new gutil.PluginError('webpack', err);
}

gutil.log("[webpack]", stats.toString({
gutil.log('[webpack]', stats.toString({
children: false,
chunks: false,
colors: true,
Expand Down
8 changes: 4 additions & 4 deletions docs/src/Dropdown/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class DropdownExample extends React.Component {
}

render() {
var simpleList = [
let simpleList = [
{
html: 'Foo',
id: 'foo'
Expand All @@ -29,7 +29,7 @@ class DropdownExample extends React.Component {
}
];

var styledItemsList = [
let styledItemsList = [
{
html:
<span>
Expand Down Expand Up @@ -92,7 +92,7 @@ class DropdownExample extends React.Component {
}
];

var dividedList = [
let dividedList = [
{
className: 'dropdown-menu-header',
html: 'Foo',
Expand Down Expand Up @@ -133,7 +133,7 @@ class DropdownExample extends React.Component {
}
];

var variedDisplayText = [
let variedDisplayText = [
{
html: 'Foo',
id: 'foo',
Expand Down
12 changes: 6 additions & 6 deletions docs/src/Table/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ class TableExample extends React.Component {
}

getColumnHeading(prop, order, sortBy) {
var caretClassNames = classNames({
let caretClassNames = classNames({
'caret': true,
'caret--asc': order === 'asc',
'caret--desc': order === 'desc',
'caret--visible': sortBy.prop === prop
});

var headingStrings = {
let headingStrings = {
'age': 'Age',
'gender': 'Gender',
'location': 'Location',
Expand All @@ -44,7 +44,7 @@ class TableExample extends React.Component {
}

getColGroup(size) {
var colGroup;
let colGroup;

switch (size) {
case 'large':
Expand All @@ -71,7 +71,7 @@ class TableExample extends React.Component {
}

getColumns(size) {
var columns;
let columns;

switch (size) {
case 'large':
Expand Down Expand Up @@ -127,7 +127,7 @@ class TableExample extends React.Component {
}

getRows(size) {
var rows;
let rows;

switch (size) {
case 'large':
Expand Down Expand Up @@ -213,7 +213,7 @@ class TableExample extends React.Component {
}

render() {
var buttonLabel;
let buttonLabel;

if (this.state.rowAdded) {
buttonLabel = 'Remove Row';
Expand Down
20 changes: 10 additions & 10 deletions src/Dropdown/Dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import classNames from 'classnames';
import * as Util from '../Util/Util';
import * as DOMUtil from '../Util/DOMUtil';

var CSSTransitionGroup = React.addons.CSSTransitionGroup;
const CSSTransitionGroup = React.addons.CSSTransitionGroup;

export default class Dropdown extends React.Component {
constructor() {
Expand All @@ -29,7 +29,7 @@ export default class Dropdown extends React.Component {
}

getSelectedHtml(id, items) {
var obj = Util.find(items, function (item) {
let obj = Util.find(items, function (item) {
return item.id === id;
});

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

getMenuItems(items) {
return items.map((item) => {
var classSet = classNames(
let classSet = classNames(
{
'is-selectable': item.selectable !== false,
'is-selected': item.id === this.state.selectedID
Expand All @@ -47,7 +47,7 @@ export default class Dropdown extends React.Component {
this.props.dropdownMenuListItemClassName
);

var handleUserClick = null;
let handleUserClick = null;

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

handleWrapperBlur(e) {
var elID = React.findDOMNode(this).dataset.reactid;
var currentEl = e.relatedTarget;
let elID = React.findDOMNode(this).dataset.reactid;
let currentEl = e.relatedTarget;

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

render() {
var dropdownStateClassSet = {
let dropdownStateClassSet = {
'open': this.state.isOpen
};
var dropdownMenu = null;
var items = this.props.items;
var wrapperClassSet = classNames(
let dropdownMenu = null;
let items = this.props.items;
let wrapperClassSet = classNames(
dropdownStateClassSet,
this.props.wrapperClassName
);
Expand Down
24 changes: 12 additions & 12 deletions src/List/List.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react/addons';
import React, {PropTypes} from 'react/addons';
import classNames from 'classnames';

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

getListItems(list, childIndex = 0) {
var items = list.map(function (item, parentIndex) {
var key = `${parentIndex}.${childIndex}`;
let items = list.map(function (item, parentIndex) {
let key = `${parentIndex}.${childIndex}`;
childIndex++;

if (item.items) {
Expand Down Expand Up @@ -40,15 +40,15 @@ export default class List extends React.Component {
}

render() {
var defaultClasses = [
let defaultClasses = [
'list'
];

var classes = classNames(
let classes = classNames(
defaultClasses.concat(this.props.className.split(' '))
);

var Tag = this.props.tag;
let Tag = this.props.tag;

return (
<Tag {...this.props} className={classes}>
Expand All @@ -68,10 +68,10 @@ List.defaultProps = {
};

List.propTypes = {
attributes: React.PropTypes.object,
className: React.PropTypes.string,
items: React.PropTypes.array.isRequired,
tag: React.PropTypes.string,
transition: React.PropTypes.bool,
transitionName: React.PropTypes.string
attributes: PropTypes.object,
className: PropTypes.string,
items: PropTypes.array.isRequired,
tag: PropTypes.string,
transition: PropTypes.bool,
transitionName: PropTypes.string
};
10 changes: 5 additions & 5 deletions src/List/ListItem.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {PropTypes} from 'react';
import classNames from 'classnames';

export default class ListItem extends React.Component {
Expand Down Expand Up @@ -32,8 +32,8 @@ ListItem.defaultProps = {
};

ListItem.propTypes = {
className: React.PropTypes.string,
children: React.PropTypes.node,
attributes: React.PropTypes.object,
tag: React.PropTypes.string
className: PropTypes.string,
children: PropTypes.node,
attributes: PropTypes.object,
tag: PropTypes.string
};
48 changes: 24 additions & 24 deletions src/Modal/ModalContents.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react/addons';
import React, {PropTypes} from 'react/addons';
import GeminiScrollbar from 'react-gemini-scrollbar';

import * as DOMUtil from '../Util/DOMUtil';
Expand Down Expand Up @@ -265,29 +265,29 @@ ModalContents.defaultProps = {
};

ModalContents.propTypes = {
children: React.PropTypes.node,
closeByBackdropClick: React.PropTypes.bool,
footer: React.PropTypes.object,
maxHeightPercentage: React.PropTypes.number,
onClose: React.PropTypes.func,
open: React.PropTypes.bool,
showCloseButton: React.PropTypes.bool,
showFooter: React.PropTypes.bool,
subHeader: React.PropTypes.node,
titleText: React.PropTypes.string,
children: PropTypes.node,
closeByBackdropClick: PropTypes.bool,
footer: PropTypes.object,
maxHeightPercentage: PropTypes.number,
onClose: PropTypes.func,
open: PropTypes.bool,
showCloseButton: PropTypes.bool,
showFooter: PropTypes.bool,
subHeader: PropTypes.node,
titleText: PropTypes.string,

// Classes
backdropClass: React.PropTypes.string,
bodyClass: React.PropTypes.string,
closeButtonClass: React.PropTypes.string,
closeIconClass: React.PropTypes.string,
closeTitleClass: React.PropTypes.string,
containerClass: React.PropTypes.string,
footerClass: React.PropTypes.string,
footerContainerClass: React.PropTypes.string,
headerClass: React.PropTypes.string,
headerContainerClass: React.PropTypes.string,
innerBodyClass: React.PropTypes.string,
modalClass: React.PropTypes.string,
titleClass: React.PropTypes.string
backdropClass: PropTypes.string,
bodyClass: PropTypes.string,
closeButtonClass: PropTypes.string,
closeIconClass: PropTypes.string,
closeTitleClass: PropTypes.string,
containerClass: PropTypes.string,
footerClass: PropTypes.string,
footerContainerClass: PropTypes.string,
headerClass: PropTypes.string,
headerContainerClass: PropTypes.string,
innerBodyClass: PropTypes.string,
modalClass: PropTypes.string,
titleClass: PropTypes.string
};
4 changes: 1 addition & 3 deletions src/Portal/Portal.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React from 'react/addons';

let PropTypes = React.PropTypes;
import React, {PropTypes} from 'react/addons';

export default class Portal extends React.Component {
componentDidMount() {
Expand Down
30 changes: 15 additions & 15 deletions src/SidePanel/SidePanelContents.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import classNames from 'classnames';
import GeminiScrollbar from 'react-gemini-scrollbar';
import React from 'react/addons';
import React, {PropTypes} from 'react/addons';

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

export default class SidePanel extends React.Component {
export default class SidePanelContents extends React.Component {
constructor() {
super();

Expand Down Expand Up @@ -132,7 +132,7 @@ export default class SidePanel extends React.Component {

}

SidePanel.defaultProps = {
SidePanelContents.defaultProps = {
closeByBackdropClick: true,
header: null,
onClose: () => {},
Expand All @@ -147,18 +147,18 @@ SidePanel.defaultProps = {
sidePanelClass: 'side-panel side-panel-large flex-container-col container container-pod container-pod-short flush-top'
};

SidePanel.propTypes = {
children: React.PropTypes.node,
closeByBackdropClick: React.PropTypes.bool,
header: React.PropTypes.node,
onClose: React.PropTypes.func,
open: React.PropTypes.bool,
SidePanelContents.propTypes = {
children: PropTypes.node,
closeByBackdropClick: PropTypes.bool,
header: PropTypes.node,
onClose: PropTypes.func,
open: PropTypes.bool,

// Classes
backdropClass: React.PropTypes.string,
bodyClass: React.PropTypes.string,
containerClass: React.PropTypes.string,
headerClass: React.PropTypes.string,
headerContainerClass: React.PropTypes.string,
sidePanelClass: React.PropTypes.string
backdropClass: PropTypes.string,
bodyClass: PropTypes.string,
containerClass: PropTypes.string,
headerClass: PropTypes.string,
headerContainerClass: PropTypes.string,
sidePanelClass: PropTypes.string
};
Loading