fix to transitional route detection using hasOwnProperty

derbyjs · Jul 28, 2012 · 188dfa5 · 188dfa5
1 parent c3133cb
commit 188dfa5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/browser.js b/lib/browser.js
@@ -9,6 +9,7 @@ require.modules.mime = function() {}
 var Route = require('express/lib/router/route')
   , History = require('./History')
   , router = module.exports = require('./router')
+  , isTransitional = router._isTransitional
 
 router.setup = setup
 
@@ -29,7 +30,7 @@ function setup(app, createPage, onRoute) {
     app[method] = function(pattern, callback, callback2) {
       var callbacks = {onRoute: onRoute}
 
-      if (pattern.from && pattern.to) {
+      if (isTransitional(pattern)) {
         var from = pattern.from
           , to = pattern.to
           , forward = pattern.forward || callback.forward || callback

diff --git a/lib/index.js b/lib/index.js
@@ -1,6 +1,7 @@
 var ExpressRouter = require('express/lib/router')
   , router = module.exports = require('./router')
   , mapRoute = router._mapRoute
+  , isTransitional = router._isTransitional
 
 router.setup = setup
 
@@ -60,7 +61,7 @@ function setup(app, createPage, onRoute) {
         , callback = route[2]
 
       // Create route for 'to' callback of transitional route
-      if (pattern.from && pattern.to) {
+      if (isTransitional(pattern)) {
         var from = pattern.from
           , to = pattern.to
         callback = pattern.forward || callback.forward || callback

diff --git a/lib/router.js b/lib/router.js
@@ -11,6 +11,9 @@ exports.set = function(setting, value) {
 exports.get = function(setting) {
   return settings[setting]
 }
+exports._isTransitional = function(pattern) {
+  return pattern.hasOwnProperty('from') && pattern.hasOwnProperty('to')
+}
 
 function mapRoute(from, params) {
   var i, path, queryString, url