Skip to content

Commit

Permalink
Merge pull request #589 from KenanY/trail
Browse files Browse the repository at this point in the history
Remove a trailing comma in the options of the HTML task and add missing semicolons in the server task
  • Loading branch information
sleeper committed Oct 8, 2012
2 parents 77e7907 + 305bfb9 commit 94ffdc5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cli/tasks/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ var options = {
buildkit: {
collapseWhitespace : false,
removeComments : false,
removeCommentsFromCDATA : false,
removeCommentsFromCDATA : false
},

compress: {
Expand Down
8 changes: 4 additions & 4 deletions cli/tasks/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ module.exports = function(grunt) {

// phantom target is a special one: it is triggered
// before launching the headless tests, and gives
// to phantomjs visibility on the same paths a
// to phantomjs visibility on the same paths a
// server:test have.
phantom: path.resolve('test'),

Expand Down Expand Up @@ -288,9 +288,9 @@ module.exports = function(grunt) {
// one (compiled assets takes precedence over same pathname within app/)
middleware.push(connect.static(path.join(opts.base, '../temp')));
// Serve static files.
middleware.push(connect.static(opts.base))
middleware.push(connect.static(opts.base));
// Make empty directories browsable.
middleware.push(connect.directory(opts.base))
middleware.push(connect.directory(opts.base));

if ( (opts.target === 'test') || ( opts.target == 'phantom')) {
// We need to expose our code as well
Expand Down Expand Up @@ -433,7 +433,7 @@ module.exports = function(grunt) {
opts = opts || {};

return function inject(req, res, next) {

// build filepath from req.url and deal with index files for trailing `/`
var filepath = req.url.slice(-1) === '/' ? req.url + 'index.html' : req.url;

Expand Down

0 comments on commit 94ffdc5

Please sign in to comment.