react-router
Advanced tools
Comparing version 0.13.1 to 0.13.2
@@ -14,2 +14,3 @@ "use strict"; | ||
exports.StaticLocation = require("./locations/StaticLocation"); | ||
exports.TestLocation = require("./locations/TestLocation"); | ||
@@ -16,0 +17,0 @@ exports.ImitateBrowserBehavior = require("./behaviors/ImitateBrowserBehavior"); |
@@ -39,4 +39,5 @@ "use strict"; | ||
// manipulation. So just guess 'pop'. | ||
notifyChange(_actionType || LocationActions.POP); | ||
var curActionType = _actionType; | ||
_actionType = null; | ||
notifyChange(curActionType || LocationActions.POP); | ||
} | ||
@@ -43,0 +44,0 @@ } |
"use strict"; | ||
var invariant = require("react/lib/invariant"); | ||
var merge = require("qs/lib/utils").merge; | ||
var objectAssign = require("object-assign"); | ||
var qs = require("qs"); | ||
@@ -10,3 +10,3 @@ | ||
var paramInjectTrailingSlashMatcher = /\/\/\?|\/\?\/|\/\?/g; | ||
var queryMatcher = /\?(.+)/; | ||
var queryMatcher = /\?(.*)$/; | ||
@@ -143,3 +143,3 @@ var _compiledPatterns = {}; | ||
if (existingQuery) query = query ? merge(existingQuery, query) : existingQuery; | ||
if (existingQuery) query = query ? objectAssign(existingQuery, query) : existingQuery; | ||
@@ -150,3 +150,3 @@ var queryString = qs.stringify(query, { arrayFormat: "brackets" }); | ||
return PathUtils.withoutQuery(path) + "?" + queryString; | ||
}return path; | ||
}return PathUtils.withoutQuery(path); | ||
} | ||
@@ -153,0 +153,0 @@ |
{ | ||
"name": "react-router", | ||
"version": "0.13.1", | ||
"version": "0.13.2", | ||
"description": "A complete routing library for React.js", | ||
@@ -22,3 +22,4 @@ "main": "lib", | ||
"qs": "2.4.1", | ||
"classnames": "1.1.x" | ||
"classnames": "1.1.x", | ||
"object-assign": "^2.0.0" | ||
}, | ||
@@ -25,0 +26,0 @@ "tags": [ |
@@ -10,9 +10,2 @@ [![npm package](https://img.shields.io/npm/v/react-router.svg?style=flat-square)](https://www.npmjs.org/package/react-router) | ||
React 0.13 Support | ||
================== | ||
Please help out, we will be shipping 0.13 support ASAP. | ||
https://github.com/rackt/react-router/issues/638 | ||
Docs | ||
@@ -148,2 +141,1 @@ ---- | ||
Ember team for solving the hardest part already. | ||
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
87383
2133
9
4
140
37
211
+ Addedobject-assign@^2.0.0