Skip to content

Commit

Permalink
release v0.4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanflorence committed Jul 26, 2014
1 parent 53ec4fa commit 8438edf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
v0.4.2
Sat, 26 Jul 2014 18:23:43 GMT

b8018b1 [added] animation example


v0.4.1
Thu, 24 Jul 2014 21:35:07 GMT

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-router",
"version": "0.4.1",
"version": "0.4.2",
"homepage": "https://github.com/rackt/react-router",
"authors": [
"Ryan Florence",
Expand Down
12 changes: 6 additions & 6 deletions dist/react-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ module.exports = Link;
},{"../helpers/makeHref":7,"../helpers/transitionTo":11,"../helpers/withoutProperties":12,"../mixins/ActiveState":14}],3:[function(_dereq_,module,exports){
var React = (typeof window !== "undefined" ? window.React : typeof global !== "undefined" ? global.React : null);
var warning = _dereq_('react/lib/warning');
var invariant = _dereq_('react/lib/invariant');
var ExecutionEnvironment = _dereq_('react/lib/ExecutionEnvironment');
var mergeProperties = _dereq_('../helpers/mergeProperties');
var goBack = _dereq_('../helpers/goBack');
Expand Down Expand Up @@ -193,7 +192,7 @@ var REF_NAME = '__activeRoute__';
/**
* <Route> components specify components that are rendered to the page when the
* URL matches a given pattern.
*
*
* Routes are arranged in a nested tree structure. When a new URL is requested,
* the tree is searched depth-first to find a route whose path matches the URL.
* When one is found, all routes in the tree that lead to it are considered
Expand Down Expand Up @@ -276,7 +275,7 @@ var Route = React.createClass({
location: React.PropTypes.oneOf([ 'hash', 'history' ]).isRequired,
handler: React.PropTypes.any.isRequired,
path: React.PropTypes.string,
name: React.PropTypes.string,
name: React.PropTypes.string
},

getDefaultProps: function () {
Expand Down Expand Up @@ -424,6 +423,7 @@ function Redirect(to, params, query) {

function findMatches(path, route) {
var children = route.props.children, matches;
var params;

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

if (matches) {
var rootParams = getRootMatch(matches).params;
var params = {};
params = {};

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

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

if (params)
return [ makeMatch(route, params) ];
Expand Down Expand Up @@ -644,7 +644,7 @@ function reversedArray(array) {

module.exports = Route;

},{"../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){
},{"../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){
var invariant = _dereq_('react/lib/invariant');
var qs = _dereq_('querystring');
var mergeProperties = _dereq_('./mergeProperties');
Expand Down
2 changes: 1 addition & 1 deletion dist/react-router.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-router",
"version": "0.4.1",
"version": "0.4.2",
"description": "A complete routing library for React.js",
"tags": [
"react",
Expand Down

0 comments on commit 8438edf

Please sign in to comment.