Skip to content

Commit ab66030

Browse files
committed
Rename elements => components
1 parent 082455b commit ab66030

20 files changed

+46
-46
lines changed

modules/__tests__/Router-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
var assert = require('assert');
22
var expect = require('expect');
33
var React = require('react');
4-
var Route = require('../elements/Route');
5-
var RouteHandler = require('../elements/RouteHandler');
4+
var Route = require('../components/Route');
5+
var RouteHandler = require('../components/RouteHandler');
66
var TestLocation = require('../locations/TestLocation');
77
var getWindowScrollPosition = require('../utils/getWindowScrollPosition');
88
var Router = require('../index');

modules/__tests__/TestHandlers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
var React = require('react');
2-
var RouteHandler = require('../elements/RouteHandler');
2+
var RouteHandler = require('../components/RouteHandler');
33
var State = require('../mixins/State');
44

55
exports.Nested = React.createClass({
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

modules/elements/RouteHandler.js renamed to modules/components/RouteHandler.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ var RouteHandler = React.createClass({
1515
},
1616

1717
contextTypes: {
18-
getElements: React.PropTypes.func.isRequired,
1918
getRouteAtDepth: React.PropTypes.func.isRequired,
19+
getRouteComponents: React.PropTypes.func.isRequired,
2020
routeHandlers: React.PropTypes.array.isRequired
2121
},
2222

@@ -35,17 +35,17 @@ var RouteHandler = React.createClass({
3535
},
3636

3737
componentDidMount: function () {
38-
this._updateElement();
38+
this._updateRouteComponent();
3939
},
4040

4141
componentDidUpdate: function () {
42-
this._updateElement();
42+
this._updateRouteComponent();
4343
},
4444

45-
_updateElement: function () {
45+
_updateRouteComponent: function () {
4646
var depth = this.getRouteDepth();
47-
var elements = this.context.getElements();
48-
elements[depth] = this.refs[this.props.ref];
47+
var components = this.context.getRouteComponents();
48+
components[depth] = this.refs[this.props.ref];
4949
},
5050

5151
render: function () {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)