File tree Expand file tree Collapse file tree 3 files changed +5
-8
lines changed
src/sentry/static/sentry/app/components Expand file tree Collapse file tree 3 files changed +5
-8
lines changed Original file line number Diff line number Diff line change 1
- import joinClasses from "react/lib/joinClasses" ;
2
1
import classNames from "classnames" ;
3
2
import React from "react" ;
4
3
@@ -51,14 +50,14 @@ var DropdownLink = React.createClass({
51
50
} ) ;
52
51
53
52
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 } >
56
55
{ this . props . title }
57
56
{ this . props . caret &&
58
57
< i className = "icon-arrow-down" />
59
58
}
60
59
</ a >
61
- < ul className = { joinClasses ( this . props . menuClasses , "dropdown-menu" ) } >
60
+ < ul className = { classNames ( this . props . menuClasses , "dropdown-menu" ) } >
62
61
{ this . props . children }
63
62
</ ul >
64
63
</ span >
Original file line number Diff line number Diff line change 1
- import joinClasses from "react/lib/joinClasses" ;
2
1
import classNames from "classnames" ;
3
2
import React from "react" ;
4
3
@@ -22,7 +21,7 @@ var LoadingIndicator = React.createClass({
22
21
} ) ;
23
22
24
23
return (
25
- < div className = { joinClasses ( this . props . className , className ) } >
24
+ < div className = { classNames ( this . props . className , className ) } >
26
25
< div className = "loading-mask" > </ div >
27
26
< div className = "loading-indicator" > </ div >
28
27
< div className = "loading-message" > { this . props . children } </ div >
Original file line number Diff line number Diff line change 1
1
import React from "react" ;
2
2
import Router from "react-router" ;
3
- import joinClasses from "react/lib/joinClasses" ;
4
3
import classNames from "classnames" ;
5
4
6
5
var MenuItem = React . createClass ( {
@@ -73,7 +72,7 @@ var MenuItem = React.createClass({
73
72
74
73
return (
75
74
< li { ...this . props } role = "presentation" title = { null } href = { null }
76
- className = { joinClasses ( this . props . className , classNames ( classes ) ) } >
75
+ className = { classNames ( this . props . className , classes ) } >
77
76
{ children }
78
77
</ li >
79
78
) ;
You can’t perform that action at this time.
0 commit comments