Permalink
Browse files

Merge branch 'feature/router'

  • Loading branch information...
2 parents 658e064 + 63db694 commit 1d2dd2a3758ddf985bb231fe4db775297f96a979 @tj tj committed Apr 25, 2011
Showing with 406 additions and 66 deletions.
  1. +0 −1 History.md
  2. +1 −1 lib/http.js
  3. +1 −1 lib/request.js
  4. +378 −0 lib/router.js
  5. +22 −59 lib/utils.js
  6. +4 −4 lib/view/view.js
View
@@ -13,7 +13,6 @@ Closes #638
* Fixed partial lookup precedence. Closes #631
Shaw]
-
2.2.2 / 2011-04-12
==================
View
@@ -11,7 +11,7 @@
var qs = require('qs')
, connect = require('connect')
- , router = connect.router
+ , router = require('./router')
, methods = router.methods.concat(['del', 'all'])
, view = require('./view')
, url = require('url')
View
@@ -197,7 +197,7 @@ req.flash = function(type, msg){
, args = arguments
, formatters = this.app.flashFormatters || {};
formatters.__proto__ = flashFormatters;
- msg = utils.miniMarkdown(utils.htmlEscape(msg));
+ msg = utils.miniMarkdown(utils.escape(msg));
msg = msg.replace(/%([a-zA-Z])/g, function(_, format){
var formatter = formatters[format];
if (formatter) return formatter(args[i++]);
Oops, something went wrong.

0 comments on commit 1d2dd2a

Please sign in to comment.