Skip to content

Commit 964d061

Browse files
committed
Merge pull request #2172 from getsentry/react-0.14
Upgrade to react 0.14
2 parents e08fce2 + f2a7131 commit 964d061

35 files changed

+85
-67
lines changed

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@
2525
"node-libs-browser": "^0.5.2",
2626
"query-string": "^2.4.0",
2727
"raven-js": "^1.1.20",
28-
"react": "^0.13.3",
29-
"react-bootstrap": "^0.26.4",
28+
"react": "0.14.0",
29+
"react-addons-pure-render-mixin": "^0.14.0",
30+
"react-bootstrap": "^0.27.0",
3031
"react-document-title": "^1.0.2",
31-
"react-lazy-load": "^1.0.4",
32-
"react-router": "^0.13.3",
33-
"react-sticky": "^2.5.2",
32+
"react-dom": "^0.14.0",
33+
"react-lazy-load": "benvinegar/react-lazy-load#64fd716d9fb243e43b1b8040f7fba52f2191f2cb",
34+
"react-router": "benvinegar/react-router#46998d030de3802ace768a673b07272586f7bf99",
35+
"react-sticky": "^3.0.0",
3436
"reflux": "^0.3.0",
3537
"select2": "^3.5.1",
3638
"style-loader": "^0.12.4",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import AlertActions from '../actions/alertActions';
3-
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
3+
import PureRenderMixin from 'react-addons-pure-render-mixin';
44

55
var AlertMessage = React.createClass({
66
mixins: [PureRenderMixin],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import Reflux from "reflux";
3-
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
3+
import PureRenderMixin from 'react-addons-pure-render-mixin';
44

55
import AlertStore from '../stores/alertStore';
66
import AlertMessage from './alertMessage';

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from "react";
2+
import ReactDOM from "react-dom";
23
import Reflux from "reflux";
34
import classNames from "classnames";
45
import api from "../api";
@@ -87,7 +88,7 @@ var AssigneeSelector = React.createClass({
8788
},
8889

8990
onDropdownOpen() {
90-
this.refs.filter.getDOMNode().focus();
91+
ReactDOM.findDOMNode(this.refs.filter).focus();
9192
},
9293

9394
onDropdownClose() {
@@ -118,7 +119,7 @@ var AssigneeSelector = React.createClass({
118119

119120
componentDidUpdate(prevProps, prevState) {
120121
// XXX(dcramer): fix odd dedraw issue as of Chrome 45.0.2454.15 dev (64-bit)
121-
var node = jQuery(this.refs.container.getDOMNode());
122+
var node = jQuery(ReactDOM.findDOMNode(this.refs.container));
122123
node.hide().show(0);
123124
},
124125

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
import jQuery from "jquery";
21
import React from "react";
2+
import jQuery from "jquery";
3+
import ReactDOM from "react-dom";
34

45
const AutoSelectText = React.createClass({
56
componentDidMount() {
6-
let ref = this.refs.element.getDOMNode();
7+
let ref = ReactDOM.findDOMNode(this.refs.element);
78
jQuery(ref).bind('click', this.selectText);
89
},
910

1011
componentWillUnmount() {
11-
let ref = this.refs.element.getDOMNode();
12+
let ref = ReactDOM.findDOMNode(this.refs.element);
1213
jQuery(ref).unbind('click', this.selectText);
1314
},
1415

1516
selectText() {
16-
var node = this.refs.element.getDOMNode().firstChild;
17+
var node = ReactDOM.findDOMNode(this.refs.element).firstChild;
1718
if (document.selection) {
1819
let range = document.body.createTextRange();
1920
range.moveToElementText(node);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from "react";
2+
import ReactDOM from "react-dom";
23

34
var ClippedBox = React.createClass({
45
propTypes: {
@@ -20,7 +21,7 @@ var ClippedBox = React.createClass({
2021
},
2122

2223
componentDidMount() {
23-
var renderedHeight = this.getDOMNode().offsetHeight;
24+
var renderedHeight = ReactDOM.findDOMNode(this).offsetHeight;
2425

2526
if (renderedHeight > this.props.clipHeight ) {
2627
/*eslint react/no-did-mount-set-state:0*/

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import joinClasses from "react/lib/joinClasses";
2-
import classNames from "classnames";
31
import React from "react";
2+
import ReactDOM from "react-dom";
3+
import classNames from "classnames";
44

55
require("bootstrap/js/dropdown");
66

@@ -21,11 +21,11 @@ var DropdownLink = React.createClass({
2121
},
2222

2323
isOpen() {
24-
return this.getDOMNode().classList.contains("open");
24+
return ReactDOM.findDOMNode(this).classList.contains("open");
2525
},
2626

2727
close() {
28-
this.getDOMNode().classList.remove("open");
28+
ReactDOM.findDOMNode(this).classList.remove("open");
2929
},
3030

3131
onToggle(e) {
@@ -51,14 +51,14 @@ var DropdownLink = React.createClass({
5151
});
5252

5353
return (
54-
<span className={joinClasses(this.props.topLevelClasses, topLevelClasses)}>
55-
<a className={joinClasses(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
54+
<span className={classNames(this.props.topLevelClasses, topLevelClasses)}>
55+
<a className={classNames(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
5656
{this.props.title}
5757
{this.props.caret &&
5858
<i className="icon-arrow-down" />
5959
}
6060
</a>
61-
<ul className={joinClasses(this.props.menuClasses, "dropdown-menu")}>
61+
<ul className={classNames(this.props.menuClasses, "dropdown-menu")}>
6262
{this.props.children}
6363
</ul>
6464
</span>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import ReactDOM from 'react-dom';
23
import jQuery from 'jquery';
34
import moment from 'moment';
45

@@ -113,7 +114,7 @@ var FlotChart = React.createClass({
113114
lines: { show: false }
114115
};
115116

116-
var chart = this.refs.chartNode.getDOMNode();
117+
var chart = ReactDOM.findDOMNode(this.refs.chartNode);
117118
jQuery.plot(chart, series, plotOptions);
118119
},
119120

src/sentry/static/sentry/app/components/group/chart.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from "react";
22
import BarChart from "../../components/barChart";
33
import PropTypes from "../../proptypes";
4-
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
4+
import PureRenderMixin from 'react-addons-pure-render-mixin';
55

66
var GroupChart = React.createClass({
77
mixins: [PureRenderMixin],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from "react";
22
import Modal from "react-bootstrap/lib/Modal";
3-
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
3+
import PureRenderMixin from 'react-addons-pure-render-mixin';
44

55
var LinkWithConfirmation = React.createClass({
66
mixins: [PureRenderMixin],

0 commit comments

Comments
 (0)