Browse files

Fixed test cases and request.js

  • Loading branch information...
1 parent f6c7de0 commit 7086282e2fd51a6cb9b51179373a7adc8081584a @iwillwen committed Mar 14, 2013
Showing with 1 addition and 13 deletions.
  1. +1 −13 lib/method.js
View
14 lib/method.js
@@ -666,11 +666,7 @@ function method (web) {
var ext = self.set('view engine') || 'jade';
var engine = require(ext);
var root = self.set('views');
-<<<<<<< HEAD
var render = EventProxy.create();
-=======
- var render = new EventProxy();
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
if (!/\/$/i.test(root)) root += '/';
render.all('layout', 'body', function (layout, body) {
layout_view.body = body;
@@ -681,11 +677,7 @@ function method (web) {
});
if (opt.layout !== false) {
if (opt.layout === undefined || opt.layout === true) {
-<<<<<<< HEAD
fs.readFile(root + 'layout.' + ext, 'utf-8', function (err, layout) {
-=======
- fs.readFile(root + 'layout.' + ext, function (err, layout) {
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
if (err) return render.trigger('layout', '#{body}');
render.trigger('layout', layout.toString());
});
@@ -722,8 +714,4 @@ function method (web) {
web[middlewares[i]] = connect[middlewares[i]];
}
}
-<<<<<<< HEAD
-module.exports.ext = method;
-=======
-module.exports.ext = method;
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
+module.exports.ext = method;

0 comments on commit 7086282

Please sign in to comment.