Skip to content
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
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@
"node-libs-browser": "^0.5.2",
"query-string": "^2.4.0",
"raven-js": "^1.1.20",
"react": "^0.13.3",
"react-bootstrap": "^0.26.4",
"react": "0.14.0",
"react-addons-pure-render-mixin": "^0.14.0",
"react-bootstrap": "^0.27.0",
"react-document-title": "^1.0.2",
"react-lazy-load": "^1.0.4",
"react-router": "^0.13.3",
"react-sticky": "^2.5.2",
"react-dom": "^0.14.0",
"react-lazy-load": "benvinegar/react-lazy-load#64fd716d9fb243e43b1b8040f7fba52f2191f2cb",
"react-router": "benvinegar/react-router#46998d030de3802ace768a673b07272586f7bf99",
"react-sticky": "^3.0.0",
"reflux": "^0.3.0",
"select2": "^3.5.1",
"style-loader": "^0.12.4",
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/static/sentry/app/components/alertMessage.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import AlertActions from '../actions/alertActions';
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var AlertMessage = React.createClass({
mixins: [PureRenderMixin],
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/static/sentry/app/components/alerts.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import Reflux from "reflux";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

import AlertStore from '../stores/alertStore';
import AlertMessage from './alertMessage';
Expand Down
5 changes: 3 additions & 2 deletions src/sentry/static/sentry/app/components/assigneeSelector.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import Reflux from "reflux";
import classNames from "classnames";
import api from "../api";
Expand Down Expand Up @@ -87,7 +88,7 @@ var AssigneeSelector = React.createClass({
},

onDropdownOpen() {
this.refs.filter.getDOMNode().focus();
ReactDOM.findDOMNode(this.refs.filter).focus();
},

onDropdownClose() {
Expand Down Expand Up @@ -118,7 +119,7 @@ var AssigneeSelector = React.createClass({

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

Expand Down
9 changes: 5 additions & 4 deletions src/sentry/static/sentry/app/components/autoSelectText.jsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import jQuery from "jquery";
import React from "react";
import jQuery from "jquery";
import ReactDOM from "react-dom";

const AutoSelectText = React.createClass({
componentDidMount() {
let ref = this.refs.element.getDOMNode();
let ref = ReactDOM.findDOMNode(this.refs.element);
jQuery(ref).bind('click', this.selectText);
},

componentWillUnmount() {
let ref = this.refs.element.getDOMNode();
let ref = ReactDOM.findDOMNode(this.refs.element);
jQuery(ref).unbind('click', this.selectText);
},

selectText() {
var node = this.refs.element.getDOMNode().firstChild;
var node = ReactDOM.findDOMNode(this.refs.element).firstChild;
if (document.selection) {
let range = document.body.createTextRange();
range.moveToElementText(node);
Expand Down
3 changes: 2 additions & 1 deletion src/sentry/static/sentry/app/components/clippedBox.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";

var ClippedBox = React.createClass({
propTypes: {
Expand All @@ -20,7 +21,7 @@ var ClippedBox = React.createClass({
},

componentDidMount() {
var renderedHeight = this.getDOMNode().offsetHeight;
var renderedHeight = ReactDOM.findDOMNode(this).offsetHeight;

if (renderedHeight > this.props.clipHeight ) {
/*eslint react/no-did-mount-set-state:0*/
Expand Down
14 changes: 7 additions & 7 deletions src/sentry/static/sentry/app/components/dropdownLink.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import joinClasses from "react/lib/joinClasses";
import classNames from "classnames";
import React from "react";
import ReactDOM from "react-dom";
import classNames from "classnames";

require("bootstrap/js/dropdown");

Expand All @@ -21,11 +21,11 @@ var DropdownLink = React.createClass({
},

isOpen() {
return this.getDOMNode().classList.contains("open");
return ReactDOM.findDOMNode(this).classList.contains("open");
},

close() {
this.getDOMNode().classList.remove("open");
ReactDOM.findDOMNode(this).classList.remove("open");
},

onToggle(e) {
Expand All @@ -51,14 +51,14 @@ var DropdownLink = React.createClass({
});

return (
<span className={joinClasses(this.props.topLevelClasses, topLevelClasses)}>
<a className={joinClasses(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
<span className={classNames(this.props.topLevelClasses, topLevelClasses)}>
<a className={classNames(this.props.className, className)} data-toggle="dropdown" onClick={this.onToggle}>
{this.props.title}
{this.props.caret &&
<i className="icon-arrow-down" />
}
</a>
<ul className={joinClasses(this.props.menuClasses, "dropdown-menu")}>
<ul className={classNames(this.props.menuClasses, "dropdown-menu")}>
{this.props.children}
</ul>
</span>
Expand Down
3 changes: 2 additions & 1 deletion src/sentry/static/sentry/app/components/flotChart.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import ReactDOM from 'react-dom';
import jQuery from 'jquery';
import moment from 'moment';

Expand Down Expand Up @@ -113,7 +114,7 @@ var FlotChart = React.createClass({
lines: { show: false }
};

var chart = this.refs.chartNode.getDOMNode();
var chart = ReactDOM.findDOMNode(this.refs.chartNode);
jQuery.plot(chart, series, plotOptions);
},

Expand Down
2 changes: 1 addition & 1 deletion src/sentry/static/sentry/app/components/group/chart.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import BarChart from "../../components/barChart";
import PropTypes from "../../proptypes";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var GroupChart = React.createClass({
mixins: [PureRenderMixin],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import Modal from "react-bootstrap/lib/Modal";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var LinkWithConfirmation = React.createClass({
mixins: [PureRenderMixin],
Expand Down
3 changes: 1 addition & 2 deletions src/sentry/static/sentry/app/components/loadingIndicator.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import joinClasses from "react/lib/joinClasses";
import classNames from "classnames";
import React from "react";

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

return (
<div className={joinClasses(this.props.className, className)}>
<div className={classNames(this.props.className, className)}>
<div className="loading-mask"></div>
<div className="loading-indicator"></div>
<div className="loading-message">{this.props.children}</div>
Expand Down
3 changes: 1 addition & 2 deletions src/sentry/static/sentry/app/components/menuItem.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import Router from "react-router";
import joinClasses from "react/lib/joinClasses";
import classNames from "classnames";

var MenuItem = React.createClass({
Expand Down Expand Up @@ -73,7 +72,7 @@ var MenuItem = React.createClass({

return (
<li {...this.props} role="presentation" title={null} href={null}
className={joinClasses(this.props.className, classNames(classes))}>
className={classNames(this.props.className, classes)}>
{children}
</li>
);
Expand Down
2 changes: 1 addition & 1 deletion src/sentry/static/sentry/app/components/mutedBox.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from "react";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var MutedBox = React.createClass({
mixins: [PureRenderMixin],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import Router from "react-router";
import jQuery from "jquery";
import ConfigStore from "../../stores/configStore";
Expand Down Expand Up @@ -132,7 +133,7 @@ var ProjectSelector = React.createClass({
},

onOpen(evt) {
this.refs.filter.getDOMNode().focus();
ReactDOM.findDOMNode(this.refs.filter).focus();
},

onClose() {
Expand All @@ -143,7 +144,7 @@ var ProjectSelector = React.createClass({

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

Expand Down
5 changes: 3 additions & 2 deletions src/sentry/static/sentry/app/components/searchBar.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import ReactDOM from "react-dom";
import PureRenderMixin from 'react-addons-pure-render-mixin';

var SearchBar = React.createClass({
contextTypes: {
Expand All @@ -24,7 +25,7 @@ var SearchBar = React.createClass({
},

blur() {
this.refs.searchInput.getDOMNode().blur();
ReactDOM.findDOMNode(this.refs.searchInput).blur();
},

onSubmit(evt) {
Expand Down
4 changes: 2 additions & 2 deletions src/sentry/static/sentry/app/components/selectInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ var SelectInput = React.createClass({
},

create() {
this.select2 = jQuery(this.refs.select.getDOMNode()).select2();
this.select2 = jQuery(this.refs.select).select2();
this.select2.on('change', this.onChange);
},

destroy() {
jQuery(this.refs.select.getDOMNode()).select2('destroy');
jQuery(this.refs.select).select2('destroy');
},

onChange(...args) {
Expand Down
9 changes: 5 additions & 4 deletions src/sentry/static/sentry/app/components/timeSince.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
import React from "react";
import moment from "moment";
import PureRenderMixin from 'react-addons-pure-render-mixin';

var TimeSince = React.createClass({
mixins: [
PureRenderMixin
],

propTypes: {
date: React.PropTypes.any.isRequired,
suffix: React.PropTypes.string
Expand Down Expand Up @@ -31,10 +36,6 @@ var TimeSince = React.createClass({
this.forceUpdate();
},

shouldComponentUpdate(nextProps, nextState) {
return this.props.date !== nextProps.date;
},

render() {
var date = this.props.date;

Expand Down
1 change: 1 addition & 0 deletions src/sentry/static/sentry/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export default {
moment: require("moment"),
Raven: require("raven-js"),
React: require("react"),
ReactDOM: require("react-dom"),
Router: require("react-router"),

Sentry: {
Expand Down
7 changes: 4 additions & 3 deletions src/sentry/static/sentry/app/mixins/tooltip.jsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import ReactDOM from "react-dom";
import $ from "jquery";
import "bootstrap/js/tooltip";

Expand All @@ -10,18 +11,18 @@ export default function (options) {

componentWillUnmount() {
this.removeTooltips();
$(this.getDOMNode()).unbind();
$(ReactDOM.findDOMNode(this)).unbind();
},

attachTooltips() {
$(this.getDOMNode()).tooltip(
$(ReactDOM.findDOMNode(this)).tooltip(
Object.prototype.toString.call(options) === '[object Function]' ?
options.call(this) : options
);
},

removeTooltips() {
$(this.getDOMNode())
$(ReactDOM.findDOMNode(this))
.tooltip("destroy") // destroy tooltips on parent ...
.find(options.selector)
.tooltip("destroy"); // ... and descendents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import IndicatorStore from "../../stores/indicatorStore";
import {logException} from "../../utils/logging";
import {getItem, setItem} from "../../utils/localStorage";

var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';
const localStorageKey = 'noteinput:latest';
const DEFAULT_ERROR_JSON = {detail: 'Unknown error. Please try again.'};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from "react";
import ConfigStore from "../../stores/configStore";
import Count from "../../components/count";
var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var getPercent = (item, total) => {
if (total === 0) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";

var PureRenderMixin = require('react/addons').addons.PureRenderMixin;
import PureRenderMixin from 'react-addons-pure-render-mixin';

var EventActions = React.createClass({
mixins: [
Expand Down
9 changes: 5 additions & 4 deletions src/sentry/static/sentry/app/views/ruleEditor/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import $ from "jquery";
import api from "../../api";
import IndicatorStore from '../../stores/indicatorStore';
Expand Down Expand Up @@ -31,13 +32,13 @@ var RuleEditor = React.createClass({

componentDidUpdate() {
if (this.state.error) {
$(document.body).scrollTop($(this.refs.form.getDOMNode()).offset().top);
$(document.body).scrollTop($(ReactDOM.findDOMNode(this.refs.form)).offset().top);
}
},

onSubmit(e) {
e.preventDefault();
var form = $(this.refs.form.getDOMNode());
var form = $(ReactDOM.findDOMNode(this.refs.form));
var conditions = [];
form.find('.rule-condition-list .rule-form').each((_, el) => {
conditions.push(this.serializeNode(el));
Expand All @@ -46,8 +47,8 @@ var RuleEditor = React.createClass({
form.find('.rule-action-list .rule-form').each((_, el) => {
actions.push(this.serializeNode(el));
});
var actionMatch = $(this.refs.actionMatch.getDOMNode()).val();
var name = $(this.refs.name.getDOMNode()).val();
var actionMatch = $(ReactDOM.findDOMNode(this.refs.actionMatch)).val();
var name = $(ReactDOM.findDOMNode(this.refs.name)).val();
var data = {
actionMatch: actionMatch,
actions: actions,
Expand Down
3 changes: 2 additions & 1 deletion src/sentry/static/sentry/app/views/ruleEditor/ruleNode.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from "react";
import ReactDOM from "react-dom";
import $ from "jquery";

var RuleNode = React.createClass({
Expand All @@ -10,7 +11,7 @@ var RuleNode = React.createClass({
},

componentDidMount() {
let $html = $(this.refs.html.getDOMNode());
let $html = $(ReactDOM.findDOMNode(this.refs.html));

$html.find('select, input, textarea').each((_, el) => {
let $el = $(el);
Expand Down
Loading