Skip to content

Commit 0c26281

Browse files
committed
Remove joinClasses (deprecated in react 0.14)
1 parent c8cacf4 commit 0c26281

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

src/sentry/static/sentry/app/components/dropdownLink.jsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import joinClasses from "react/lib/joinClasses";
21
import classNames from "classnames";
32
import React from "react";
43

@@ -51,14 +50,14 @@ var DropdownLink = React.createClass({
5150
});
5251

5352
return (
54-
<span className={joinClasses(this.props.topLevelClasses, topLevelClasses)}>
55-
<a className={joinClasses(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
53+
<span className={classNames(this.props.topLevelClasses, topLevelClasses)}>
54+
<a className={classNames(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
5655
{this.props.title}
5756
{this.props.caret &&
5857
<i className="icon-arrow-down" />
5958
}
6059
</a>
61-
<ul className={joinClasses(this.props.menuClasses, "dropdown-menu")}>
60+
<ul className={classNames(this.props.menuClasses, "dropdown-menu")}>
6261
{this.props.children}
6362
</ul>
6463
</span>

src/sentry/static/sentry/app/components/loadingIndicator.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import joinClasses from "react/lib/joinClasses";
21
import classNames from "classnames";
32
import React from "react";
43

@@ -22,7 +21,7 @@ var LoadingIndicator = React.createClass({
2221
});
2322

2423
return (
25-
<div className={joinClasses(this.props.className, className)}>
24+
<div className={classNames(this.props.className, className)}>
2625
<div className="loading-mask"></div>
2726
<div className="loading-indicator"></div>
2827
<div className="loading-message">{this.props.children}</div>

src/sentry/static/sentry/app/components/menuItem.jsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import React from "react";
22
import Router from "react-router";
3-
import joinClasses from "react/lib/joinClasses";
43
import classNames from "classnames";
54

65
var MenuItem = React.createClass({
@@ -73,7 +72,7 @@ var MenuItem = React.createClass({
7372

7473
return (
7574
<li {...this.props} role="presentation" title={null} href={null}
76-
className={joinClasses(this.props.className, classNames(classes))}>
75+
className={classNames(this.props.className, classes)}>
7776
{children}
7877
</li>
7978
);

0 commit comments

Comments
 (0)