Skip to content

If query is a string, parse it first. #1312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

If query is a string, parse it first. #1312

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions modules/RouterContextMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import invariant from 'invariant';
import { stripLeadingSlashes, stringifyQuery } from './URLUtils';
import { stripLeadingSlashes, stringifyQuery, parseQueryString } from './URLUtils';

var { func, object } = React.PropTypes;

Expand All @@ -22,6 +22,10 @@ function queryIsActive(query, activeQuery) {
if (query == null)
return true;

if (typeof query === 'string') {
query = parseQueryString(query);
}

for (var p in query)
if (query.hasOwnProperty(p) && String(query[p]) !== String(activeQuery[p]))
return false;
Expand Down Expand Up @@ -73,7 +77,7 @@ var RouterContextMixin = {
makeHref(pathname, query) {
return this.makePath(pathname, query);
},

/**
* Pushes a new Location onto the history stack.
*/
Expand Down Expand Up @@ -131,7 +135,7 @@ var RouterContextMixin = {
goForward() {
this.go(1);
},

/**
* Returns true if a <Link> to the given pathname/query combination is
* currently active.
Expand Down