Skip to content

Commit 3e27541

Browse files
committed
Merge pull request #1693 from learning-unlimited/react-version-bump
Bump react version to 0.13.3
2 parents a4b9552 + 26dedd7 commit 3e27541

File tree

5 files changed

+13
-19
lines changed

5 files changed

+13
-19
lines changed

esp/public/media/scripts/program/modules/scheduling_checks.jsx

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
/**
42
* List of scheduling checks.
53
*

esp/public/media/scripts/query-builder.jsx

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
/** @jsx React.DOM */
2-
31
var booleanFilters = [
42
{
53
"name": "and",
@@ -273,8 +271,8 @@ var Filter = React.createClass({
273271
// We need to get the class with the name that is the
274272
// string input.reactClass. Doing so is
275273
// *terrifyingly* easy.
276-
var inputClass = window[input.reactClass];
277-
return <inputClass ref={i} key={i} input={input} />;
274+
var InputClass = window[input.reactClass];
275+
return <InputClass ref={i} key={i} input={input} />;
278276
});
279277
return <span>
280278
{inputs}
@@ -333,7 +331,7 @@ var SelectInput = React.createClass({
333331
},
334332

335333
asJSON: function () {
336-
var val = this.refs.select.getDOMNode().value;
334+
var val = React.findDOMNode(this.refs.select).value;
337335
if (val == "") {
338336
this.setState({error: "Select an option!"});
339337
throw new BuildQueryError();
@@ -403,8 +401,8 @@ var OptionalInput = React.createClass({
403401
var inner = null;
404402
buttonClasses="qb-optional-button qb-input btn "
405403
if (this.state.show) {
406-
var innerClass = window[this.props.input.inner.reactClass];
407-
inner = <innerClass ref="inner" input={this.props.input.inner} />;
404+
var InnerClass = window[this.props.input.inner.reactClass];
405+
inner = <InnerClass ref="inner" input={this.props.input.inner} />;
408406
buttonClasses = buttonClasses + "active btn-success"
409407
} else {
410408
buttonClasses = buttonClasses + "btn-default"
@@ -438,8 +436,8 @@ var DatetimeInput = React.createClass({
438436

439437
asJSON: function () {
440438
return {
441-
comparison: this.refs.comparison.getDOMNode().value,
442-
datetime: this.refs.datetime.getDOMNode().value,
439+
comparison: React.findDOMNode(this.refs.comparison).value,
440+
datetime: React.findDOMNode(this.refs.datetime).value,
443441
};
444442
},
445443

@@ -448,7 +446,7 @@ var DatetimeInput = React.createClass({
448446
},
449447

450448
componentDidUpdate: function () {
451-
$j(this.refs.datetime.getDOMNode()).datetimepicker();
449+
$j(React.findDOMNode(this.refs.datetime)).datetimepicker();
452450
},
453451

454452
render: function () {
@@ -482,7 +480,7 @@ var TextInput = React.createClass({
482480
},
483481

484482
asJSON: function () {
485-
return this.refs.input.getDOMNode().value;
483+
return React.findDOMNode(this.refs.input).value;
486484
},
487485

488486
render: function () {

esp/templates/elements/html

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<script type="text/javascript" src="/media/scripts/common.js"></script>
4545
{% endblock jquery %}
4646

47-
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.11.2/react.js"></script>
48-
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/react/0.11.2/JSXTransformer.js"></script>
47+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.3/react.js"></script>
48+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/react/0.13.3/JSXTransformer.js"></script>
4949
<script type="text/javascript" src="/media/scripts/lodash.compat.min.js"></script>
5050

5151
{% block js1 %}

esp/templates/program/modules/schedulingcheckmodule/output.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ <h1>Schedule Diagnostic Output for {{program.niceName}} </h1>
3232

3333
<div id="scheduling-check-wrapper"/>
3434
<script type="text/jsx">
35-
/** @jsx React.DOM */
36-
React.renderComponent(
35+
React.render(
3736
<SchedulingCheckList>
3837
{% for slug, title in check_list %}
3938
<SchedulingCheck slug="{{slug}}" title="{{title}}" />
+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<div id="query-builder-{{uid}}"></div>
22
<script type="text/jsx">
3-
/** @jsx React.DOM */
43
var spec = {{ json_spec|safe }};
5-
React.renderComponent(
4+
React.render(
65
<QueryBuilder spec={spec}/>,
76
document.getElementById("query-builder-{{uid}}"));
87
</script>

0 commit comments

Comments
 (0)