Skip to content

Commit 8438edf

Browse files
committed
release v0.4.2
1 parent 53ec4fa commit 8438edf

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

CHANGELOG

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
v0.4.2
2+
Sat, 26 Jul 2014 18:23:43 GMT
3+
4+
b8018b1 [added] animation example
5+
6+
17
v0.4.1
28
Thu, 24 Jul 2014 21:35:07 GMT
39

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"homepage": "https://github.com/rackt/react-router",
55
"authors": [
66
"Ryan Florence",

dist/react-router.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ module.exports = Link;
159159
},{"../helpers/makeHref":7,"../helpers/transitionTo":11,"../helpers/withoutProperties":12,"../mixins/ActiveState":14}],3:[function(_dereq_,module,exports){
160160
var React = (typeof window !== "undefined" ? window.React : typeof global !== "undefined" ? global.React : null);
161161
var warning = _dereq_('react/lib/warning');
162-
var invariant = _dereq_('react/lib/invariant');
163162
var ExecutionEnvironment = _dereq_('react/lib/ExecutionEnvironment');
164163
var mergeProperties = _dereq_('../helpers/mergeProperties');
165164
var goBack = _dereq_('../helpers/goBack');
@@ -193,7 +192,7 @@ var REF_NAME = '__activeRoute__';
193192
/**
194193
* <Route> components specify components that are rendered to the page when the
195194
* URL matches a given pattern.
196-
*
195+
*
197196
* Routes are arranged in a nested tree structure. When a new URL is requested,
198197
* the tree is searched depth-first to find a route whose path matches the URL.
199198
* When one is found, all routes in the tree that lead to it are considered
@@ -276,7 +275,7 @@ var Route = React.createClass({
276275
location: React.PropTypes.oneOf([ 'hash', 'history' ]).isRequired,
277276
handler: React.PropTypes.any.isRequired,
278277
path: React.PropTypes.string,
279-
name: React.PropTypes.string,
278+
name: React.PropTypes.string
280279
},
281280

282281
getDefaultProps: function () {
@@ -424,6 +423,7 @@ function Redirect(to, params, query) {
424423

425424
function findMatches(path, route) {
426425
var children = route.props.children, matches;
426+
var params;
427427

428428
// Check the subtree first to find the most deeply-nested match.
429429
if (Array.isArray(children)) {
@@ -436,7 +436,7 @@ function findMatches(path, route) {
436436

437437
if (matches) {
438438
var rootParams = getRootMatch(matches).params;
439-
var params = {};
439+
params = {};
440440

441441
Path.extractParamNames(route.props.path).forEach(function (paramName) {
442442
params[paramName] = rootParams[paramName];
@@ -448,7 +448,7 @@ function findMatches(path, route) {
448448
}
449449

450450
// No routes in the subtree matched, so check this route.
451-
var params = Path.extractParams(route.props.path, path);
451+
params = Path.extractParams(route.props.path, path);
452452

453453
if (params)
454454
return [ makeMatch(route, params) ];
@@ -644,7 +644,7 @@ function reversedArray(array) {
644644

645645
module.exports = Route;
646646

647-
},{"../helpers/Path":4,"../helpers/goBack":6,"../helpers/mergeProperties":9,"../helpers/replaceWith":10,"../helpers/transitionTo":11,"../helpers/withoutProperties":12,"../stores/ActiveStore":15,"../stores/RouteStore":16,"../stores/URLStore":17,"es6-promise":21,"react/lib/ExecutionEnvironment":46,"react/lib/invariant":49,"react/lib/warning":50}],4:[function(_dereq_,module,exports){
647+
},{"../helpers/Path":4,"../helpers/goBack":6,"../helpers/mergeProperties":9,"../helpers/replaceWith":10,"../helpers/transitionTo":11,"../helpers/withoutProperties":12,"../stores/ActiveStore":15,"../stores/RouteStore":16,"../stores/URLStore":17,"es6-promise":21,"react/lib/ExecutionEnvironment":46,"react/lib/warning":50}],4:[function(_dereq_,module,exports){
648648
var invariant = _dereq_('react/lib/invariant');
649649
var qs = _dereq_('querystring');
650650
var mergeProperties = _dereq_('./mergeProperties');

dist/react-router.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"description": "A complete routing library for React.js",
55
"tags": [
66
"react",

0 commit comments

Comments
 (0)