Skip to content

Commit

Permalink
release v0.11.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanflorence committed Nov 24, 2014
1 parent d73783a commit a38ab4b
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
v0.11.2 - Mon, 24 Nov 2014 16:56:52 GMT
---------------------------------------

- [017363d](../../commit/017363d) [fixed] default redirect path to '*'
- [187eb0e](../../commit/187eb0e) [fixed] Added missing require statement
- [5a1ed33](../../commit/5a1ed33) [fixed] Path.decode/encode with query string


v0.11.1 - Sat, 22 Nov 2014 15:00:37 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.11.1",
"version": "0.11.2",
"homepage": "https://github.com/rackt/react-router",
"authors": [
"Ryan Florence",
Expand Down
21 changes: 7 additions & 14 deletions dist/react-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -950,14 +950,6 @@ var invariant = _dereq_('react/lib/invariant');
var merge = _dereq_('qs/lib/utils').merge;
var qs = _dereq_('qs');

function decodePathSegment(string) {
return decodeURIComponent(string.replace(/\+/g, ' '));
}

function encodePathSegment(string) {
return encodeURIComponent(string).replace(/%20/g, '+');
}

var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g;
var paramInjectMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g;
var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?/g;
Expand Down Expand Up @@ -994,15 +986,15 @@ var Path = {
/**
* Safely decodes special characters in the given URL path.
*/
decode: function decodePath(path) {
return String(path).split('/').map(decodePathSegment).join('/');
decode: function (path) {
return decodeURI(path.replace(/\+/g, ' '));
},

/**
* Safely encodes special characters in the given URL path.
*/
encode: function encodePath(path) {
return String(path).split('/').map(encodePathSegment).join('/');
encode: function (path) {
return encodeURI(path).replace(/%20/g, '+');
},

/**
Expand Down Expand Up @@ -1302,6 +1294,7 @@ var ImitateBrowserBehavior = _dereq_('../behaviors/ImitateBrowserBehavior');
var RouteHandler = _dereq_('../components/RouteHandler');
var HashLocation = _dereq_('../locations/HashLocation');
var HistoryLocation = _dereq_('../locations/HistoryLocation');
var RefreshLocation = _dereq_('../locations/RefreshLocation');
var NavigationContext = _dereq_('../mixins/NavigationContext');
var StateContext = _dereq_('../mixins/StateContext');
var Scrolling = _dereq_('../mixins/Scrolling');
Expand Down Expand Up @@ -1723,7 +1716,7 @@ function createRouter(options) {

module.exports = createRouter;

},{"../behaviors/ImitateBrowserBehavior":2,"../components/RouteHandler":8,"../locations/HashLocation":10,"../locations/HistoryLocation":11,"../mixins/NavigationContext":15,"../mixins/Scrolling":16,"../mixins/StateContext":18,"./Path":19,"./PropTypes":21,"./Redirect":22,"./Transition":23,"./createRoutesFromChildren":25,"./supportsHistory":29,"react/lib/ExecutionEnvironment":35,"react/lib/invariant":39,"react/lib/warning":40}],25:[function(_dereq_,module,exports){
},{"../behaviors/ImitateBrowserBehavior":2,"../components/RouteHandler":8,"../locations/HashLocation":10,"../locations/HistoryLocation":11,"../locations/RefreshLocation":12,"../mixins/NavigationContext":15,"../mixins/Scrolling":16,"../mixins/StateContext":18,"./Path":19,"./PropTypes":21,"./Redirect":22,"./Transition":23,"./createRoutesFromChildren":25,"./supportsHistory":29,"react/lib/ExecutionEnvironment":35,"react/lib/invariant":39,"react/lib/warning":40}],25:[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');
Expand Down Expand Up @@ -1783,7 +1776,7 @@ function createRoute(element, parentRoute, namedRoutes) {

if (type === Redirect.type) {
route.handler = createRedirectHandler(props.to, props.params, props.query);
props.path = props.path || props.from;
props.path = props.path || props.from || '*';
} else {
route.handler = props.handler;
}
Expand Down
4 changes: 2 additions & 2 deletions dist/react-router.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-router",
"version": "0.11.1",
"version": "0.11.2",
"description": "A complete routing library for React.js",
"main": "./modules/index",
"repository": {
Expand Down Expand Up @@ -65,4 +65,4 @@
"browserify-shim": {
"react": "global:React"
}
}
}

0 comments on commit a38ab4b

Please sign in to comment.