Skip to content

Commit a38ab4b

Browse files
committed
release v0.11.2
1 parent d73783a commit a38ab4b

File tree

5 files changed

+20
-19
lines changed

5 files changed

+20
-19
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
v0.11.2 - Mon, 24 Nov 2014 16:56:52 GMT
2+
---------------------------------------
3+
4+
- [017363d](../../commit/017363d) [fixed] default redirect path to '*'
5+
- [187eb0e](../../commit/187eb0e) [fixed] Added missing require statement
6+
- [5a1ed33](../../commit/5a1ed33) [fixed] Path.decode/encode with query string
7+
8+
19
v0.11.1 - Sat, 22 Nov 2014 15:00:37 GMT
210
---------------------------------------
311

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.11.1",
3+
"version": "0.11.2",
44
"homepage": "https://github.com/rackt/react-router",
55
"authors": [
66
"Ryan Florence",

dist/react-router.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -950,14 +950,6 @@ var invariant = _dereq_('react/lib/invariant');
950950
var merge = _dereq_('qs/lib/utils').merge;
951951
var qs = _dereq_('qs');
952952

953-
function decodePathSegment(string) {
954-
return decodeURIComponent(string.replace(/\+/g, ' '));
955-
}
956-
957-
function encodePathSegment(string) {
958-
return encodeURIComponent(string).replace(/%20/g, '+');
959-
}
960-
961953
var paramCompileMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$]*)|[*.()\[\]\\+|{}^$]/g;
962954
var paramInjectMatcher = /:([a-zA-Z_$][a-zA-Z0-9_$?]*[?]?)|[*]/g;
963955
var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?/g;
@@ -994,15 +986,15 @@ var Path = {
994986
/**
995987
* Safely decodes special characters in the given URL path.
996988
*/
997-
decode: function decodePath(path) {
998-
return String(path).split('/').map(decodePathSegment).join('/');
989+
decode: function (path) {
990+
return decodeURI(path.replace(/\+/g, ' '));
999991
},
1000992

1001993
/**
1002994
* Safely encodes special characters in the given URL path.
1003995
*/
1004-
encode: function encodePath(path) {
1005-
return String(path).split('/').map(encodePathSegment).join('/');
996+
encode: function (path) {
997+
return encodeURI(path).replace(/%20/g, '+');
1006998
},
1007999

10081000
/**
@@ -1302,6 +1294,7 @@ var ImitateBrowserBehavior = _dereq_('../behaviors/ImitateBrowserBehavior');
13021294
var RouteHandler = _dereq_('../components/RouteHandler');
13031295
var HashLocation = _dereq_('../locations/HashLocation');
13041296
var HistoryLocation = _dereq_('../locations/HistoryLocation');
1297+
var RefreshLocation = _dereq_('../locations/RefreshLocation');
13051298
var NavigationContext = _dereq_('../mixins/NavigationContext');
13061299
var StateContext = _dereq_('../mixins/StateContext');
13071300
var Scrolling = _dereq_('../mixins/Scrolling');
@@ -1723,7 +1716,7 @@ function createRouter(options) {
17231716

17241717
module.exports = createRouter;
17251718

1726-
},{"../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){
1719+
},{"../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){
17271720
var React = (typeof window !== "undefined" ? window.React : typeof global !== "undefined" ? global.React : null);
17281721
var warning = _dereq_('react/lib/warning');
17291722
var invariant = _dereq_('react/lib/invariant');
@@ -1783,7 +1776,7 @@ function createRoute(element, parentRoute, namedRoutes) {
17831776

17841777
if (type === Redirect.type) {
17851778
route.handler = createRedirectHandler(props.to, props.params, props.query);
1786-
props.path = props.path || props.from;
1779+
props.path = props.path || props.from || '*';
17871780
} else {
17881781
route.handler = props.handler;
17891782
}

dist/react-router.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-router",
3-
"version": "0.11.1",
3+
"version": "0.11.2",
44
"description": "A complete routing library for React.js",
55
"main": "./modules/index",
66
"repository": {
@@ -65,4 +65,4 @@
6565
"browserify-shim": {
6666
"react": "global:React"
6767
}
68-
}
68+
}

0 commit comments

Comments
 (0)