Skip to content

Commit 9d53e97

Browse files
committed
add a option shiftRouterNameFromUrl for dispatcher
when this flag is true(default), act as yog2's default action. when this flag is false, act as express's default action.
1 parent dd1a6ac commit 9d53e97

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

plugins/dispatcher/dispatcher.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ var VERB = {
2828
module.exports = function (options) {
2929
var defaultRouter = options.defaultRouter || 'home';
3030
var defaultAction = options.defaultAction || 'index';
31+
var shiftRouterNameFromUrl = true;
32+
if( options.hasOwnProperty(shiftRouterNameFromUrl) ){
33+
shiftRouterNameFromUrl = !!options.shiftRouterNameFromUrl;
34+
}
35+
3136
var appPath = options.appPath || (path.dirname(require.main.filename) + '/app');
3237
debuglog('set options appPath [%s], defaultRouter [%s], defaultAction [%s]', appPath, defaultRouter, defaultAction);
3338
var routers = {};
@@ -55,7 +60,7 @@ module.exports = function (options) {
5560
return;
5661
}
5762
debuglog('actually get router [%s]', router.__name__);
58-
if (router.__name__ === routerName && req.params.router) {
63+
if (router.__name__ === routerName && req.params.router && shiftRouterNameFromUrl) {
5964
req.url = shiftUrl(req.url);
6065
debuglog('router is matched, remove router from url [%s]', req.url);
6166
}
@@ -86,7 +91,7 @@ module.exports = function (options) {
8691
return;
8792
}
8893
debuglog('actually get action [%s]', action.__name__);
89-
if (action.__name__ === actionName && req.params.action) {
94+
if (action.__name__ === actionName && req.params.action && shiftRouterNameFromUrl) {
9095
req.url = shiftUrl(req.url);
9196
debuglog('action is matched, remove action from url [%s]', req.url);
9297
}

0 commit comments

Comments
 (0)