Skip to content

Commit

Permalink
JSLint fixes for new version
Browse files Browse the repository at this point in the history
- forgot to force install
- had to clean up grunt task now we no longer need the 'm' alias
- cleaned up a couple of issues it wasn't picking up before
  • Loading branch information
ErisDS committed Jul 31, 2013
1 parent 029e0b6 commit 6a2851e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
5 changes: 1 addition & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var path = require('path'),
pkg: grunt.file.readJSON('package.json'),

// JSLint all the things!
jslintm: {
jslint: {
server: {
directives: {
// node environment
Expand Down Expand Up @@ -284,9 +284,6 @@ var path = require('path'),
cfg.buildType = type;
});

// jslintm aliased to jslint
grunt.registerTask("jslint", ["jslintm"]);

// Prepare the project for development
// TODO: Git submodule init/update (https://github.com/jaubourg/grunt-update-submodules)?
grunt.registerTask("init", ["shell:bourbon", "sass:admin", 'handlebars']);
Expand Down
2 changes: 1 addition & 1 deletion core/server/require-tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var when = require('when'),
});
});

return keys.all(subtree).then(function(theFiles) {
return keys.all(subtree).then(function (theFiles) {
return treeDeferred.resolve(theFiles);
});
});
Expand Down
6 changes: 3 additions & 3 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ disableCachedResult = function (req, res, next) {
next();
};

ghost.app().configure(function() {
ghost.app().configure(function () {
ghost.app().use(isGhostAdmin);
ghost.app().use(express.favicon(__dirname + '/content/images/favicon.ico'));
ghost.app().use(I18n.load(ghost));
Expand All @@ -136,7 +136,7 @@ ghost.app().configure(function() {
}
});

ghost.app().configure("development", function() {
ghost.app().configure("development", function () {
ghost.app().use(express.errorHandler({ dumpExceptions: true, showStack: true }));
ghost.app().use(express.logger('dev'));
});
Expand Down Expand Up @@ -178,7 +178,7 @@ when.all([ghost.init(), filters.loadCoreFilters(ghost), helpers.loadCoreHelpers(
ghost.app().get('/ghost/settings*', auth, admin.settings);
ghost.app().get('/ghost/debug', auth, admin.debug.index);
ghost.app().get('/ghost/debug/db/export/', auth, admin.debug['export']);
ghost.app().post('/ghost/debug/db/import/', auth, admin.debug.import);
ghost.app().post('/ghost/debug/db/import/', auth, admin.debug['import']);
ghost.app().get('/ghost/debug/db/reset/', auth, admin.debug.reset);
ghost.app().get(/^\/(ghost$|(ghost-admin|admin|wp-admin|dashboard|login)\/?)/, auth, function (req, res) {
res.redirect('/ghost/');
Expand Down

0 comments on commit 6a2851e

Please sign in to comment.