Skip to content
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

Jump to bottom

remove routeArgs #15788

Merged
merged 1 commit into from
Nov 7, 2017
Merged

remove routeArgs #15788

Show file tree
Hide file tree
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
18 changes: 6 additions & 12 deletions packages/ember-routing/lib/services/routing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ import {
Service,
readOnly
} from 'ember-runtime';

import { get } from 'ember-metal';
import { routeArgs } from '../utils';

/**
The Routing service is used by LinkComponent, and provides facilities for
Expand Down Expand Up @@ -46,21 +44,17 @@ export default Service.extend({
},

normalizeQueryParams(routeName, models, queryParams) {
let router = get(this, 'router');
router._prepareQueryParams(routeName, models, queryParams);
get(this, 'router')._prepareQueryParams(routeName, models, queryParams);
},

generateURL(routeName, models, queryParams) {
let router = get(this, 'router');
if (!router._routerMicrolib) { return; }

let visibleQueryParams = {};
assign(visibleQueryParams, queryParams);

this.normalizeQueryParams(routeName, models, visibleQueryParams);
if (queryParams) {
assign(visibleQueryParams, queryParams);
this.normalizeQueryParams(routeName, models, visibleQueryParams);
}

let args = routeArgs(routeName, models, visibleQueryParams);
return router.generate(...args);
return get(this, 'router').generate(routeName, ...models, { queryParams: visibleQueryParams });
},

isActiveForRoute(contexts, queryParams, routeName, routerState, isCurrentWhenSpecified) {
Expand Down
4 changes: 1 addition & 3 deletions packages/ember-routing/lib/system/router.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import {
import EmberRouterDSL from './dsl';
import EmberLocation from '../location/api';
import {
routeArgs,
resemblesURL,
getActiveTargetName,
calculateCacheKey,
Expand Down Expand Up @@ -766,8 +765,7 @@ const EmberRouter = EmberObject.extend(Evented, {
assign(queryParams, _queryParams);
this._prepareQueryParams(targetRouteName, models, queryParams, _keepDefaultQueryParamValues);

let transitionArgs = routeArgs(targetRouteName, models, queryParams);
let transition = this._routerMicrolib.transitionTo(...transitionArgs);
let transition = this._routerMicrolib.transitionTo(targetRouteName, ...models, { queryParams });

didBeginTransition(transition, this);

Expand Down
10 changes: 0 additions & 10 deletions packages/ember-routing/lib/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,6 @@ export function extractRouteArgs(args) {
return { routeName, models: args, queryParams };
}

export function routeArgs(targetRouteName, models, queryParams) {
let args = [];
if (typeof targetRouteName === 'string') {
args.push(`${targetRouteName}`);
}
args.push(...models);
args.push({ queryParams });
return args;
}

export function getActiveTargetName(router) {
let handlerInfos = router.activeTransition ?
router.activeTransition.state.handlerInfos :
Expand Down