Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Remove a trailing comma in the options of the HTML task and add missing semicolons in the server task #589

Merged
merged 1 commit into from

2 participants

@sleeper
Owner

Wonderful. Did you signed the CLA ?

@KenanY

Yes.

@sleeper sleeper merged commit 94ffdc5 into yeoman:master
@sleeper
Owner

Thanks a lot @KenanY !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 6, 2012
  1. @KenanY

    Remove a trailing comma in the options of the HTML task and add missi…

    KenanY authored
    …ng semicolons in the server task
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 5 deletions.
  1. +1 −1  cli/tasks/html.js
  2. +4 −4 cli/tasks/server.js
View
2  cli/tasks/html.js
@@ -55,7 +55,7 @@ var options = {
buildkit: {
collapseWhitespace : false,
removeComments : false,
- removeCommentsFromCDATA : false,
+ removeCommentsFromCDATA : false
},
compress: {
View
8 cli/tasks/server.js
@@ -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'),
@@ -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
@@ -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;
Something went wrong with that request. Please try again.