mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-04 15:37:51 +02:00
Code Issues Releases Wiki Activity

Combine route/query params in route construction

Browse Source 
One params object is passed, and then route params are extracted into
the route and the rest are appended as query params.
This commit is contained in:
Toby Zerner
2015-05-02 08:21:40 +09:30
parent 5d4d031f59
commit bdf71abf23
10 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
framework/core/js/lib/utils/app.js
View File

@@ -10,11 +10,14 @@ class App {
this.initializers.toArray().forEach((initializer) => initializer(this));
}
route(name, args, queryParams) {
var queryString = m.route.buildQueryString(queryParams);
return this.routes[name][0].replace(/:([^\/]+)/g, function(m, t) {
return typeof args[t] === 'function' ? args[t]() : args[t];
}) + (queryString ? '?'+queryString : '');
route(name, params) {
var url = this.routes[name][0].replace(/:([^\/]+)/g, function(m, t) {
var value = params[t];
delete params[t];
return value;
});
var queryString = m.route.buildQueryString(params);
return url+(queryString ? '?'+queryString : '');
}
}