Skip to content

Commit

Permalink
trailing spaces cleanup, closes #82
Browse files Browse the repository at this point in the history
  • Loading branch information
jedireza committed Dec 2, 2013
1 parent 9d3f814 commit 321a276
Show file tree
Hide file tree
Showing 90 changed files with 1,191 additions and 1,179 deletions.
10 changes: 5 additions & 5 deletions .jshintrc-client
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
Expand Down Expand Up @@ -29,7 +29,7 @@
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
Expand All @@ -56,7 +56,7 @@
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : true, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
Expand All @@ -71,13 +71,13 @@
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules

// Custom Globals
"predef" : ["$", "_", "Backbone", "moment", "app"] // additional predefined global variables
}
10 changes: 5 additions & 5 deletions .jshintrc-server
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"maxerr" : 50, // {int} Maximum error before stopping

// Enforcing
"bitwise" : true, // true: Prohibit bitwise operators (&, |, ^, etc.)
"camelcase" : false, // true: Identifiers must be in camelCase
Expand Down Expand Up @@ -29,7 +29,7 @@
"maxstatements" : false, // {int} Max number statements per function
"maxcomplexity" : false, // {int} Max cyclomatic complexity per function
"maxlen" : false, // {int} Max number of characters per line

// Relaxing
"asi" : false, // true: Tolerate Automatic Semicolon Insertion (no semicolons)
"boss" : false, // true: Tolerate assignments where comparisons would be expected
Expand All @@ -56,7 +56,7 @@
"sub" : false, // true: Tolerate using `[]` notation when it can still be expressed in dot notation
"supernew" : false, // true: Tolerate `new function () { ... };` and `new Object;`
"validthis" : false, // true: Tolerate using this in a non-constructor function

// Environments
"browser" : false, // Web Browser (window, document, etc)
"couch" : false, // CouchDB
Expand All @@ -71,13 +71,13 @@
"worker" : false, // Web Workers
"wsh" : false, // Windows Scripting Host
"yui" : false, // Yahoo User Interface

// Legacy
"nomen" : false, // true: Prohibit dangling `_` in variables
"onevar" : false, // true: Allow only one `var` statement per function
"passfail" : false, // true: Stop on first error
"white" : false, // true: Check against strict whitespace and indentation rules

// Custom Globals
"predef" : [ ] // additional predefined global variables
}
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ module.exports = function(grunt) {
}
}
});

grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-less');
Expand All @@ -168,7 +168,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-concurrent');
grunt.loadNpmTasks('grunt-nodemon');
grunt.loadNpmTasks('grunt-newer');

grunt.registerTask('default', ['newer:uglify', 'newer:less', 'concurrent']);
grunt.registerTask('build', ['uglify', 'less']);
grunt.registerTask('lint', ['jshint']);
Expand Down
10 changes: 5 additions & 5 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ app.configure(function(){
//twitter settings
app.set('twitter-oauth-key', config.oauth.twitter.key);
app.set('twitter-oauth-secret', config.oauth.twitter.secret);

//github settings
app.set('github-oauth-key', config.oauth.github.key);
app.set('github-oauth-secret', config.oauth.github.secret);

//facebook settings
app.set('facebook-oauth-key', config.oauth.facebook.key);
app.set('facebook-oauth-secret', config.oauth.facebook.secret);

//middleware
app.use(express.favicon(__dirname + '/public/favicon.ico'));
app.use(express.logger('dev'));
Expand All @@ -73,10 +73,10 @@ app.configure(function(){
app.use(passport.initialize());
app.use(passport.session());
app.use(app.router);

//error handler
app.use(require('./views/http/index').http500);

//global locals
app.locals.projectName = app.get('project-name');
app.locals.copyrightYear = new Date().getFullYear();
Expand Down
10 changes: 5 additions & 5 deletions layouts/account.jade
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ html
li: a(href='/logout/')
i.fa.fa-user
| Sign Out

div.page
div.container
block body

div.footer
div.container
div.inner
Expand All @@ -39,12 +39,12 @@ html
li: a(href='/') Home
li: a(href='/logout/') Sign Out
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')

//if lte IE 9
script(src='/layouts/ie-sucks.min.js?#{cacheBreaker}')
script(src='/layouts/core.min.js?#{cacheBreaker}')

block feet
14 changes: 7 additions & 7 deletions layouts/admin.jade
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ html
ul.nav.navbar-nav
li.dropdown
a.dropdown-toggle(href='#', data-toggle='dropdown')
| System
| System 
span.caret
ul.dropdown-menu
li.dropdown-header Pivoted Settings
Expand All @@ -35,11 +35,11 @@ html
li: a(href='/admin/administrators/') Administrators
li: a(href='/admin/admin-groups/') Admin Groups
form.navbar-form.pull-right#_search

div.page
div.container
block body

div.footer
div.container
div.inner
Expand All @@ -49,10 +49,10 @@ html
li: a(href='/') Home
li: a(href='/logout/') Sign Out
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')

script(type='text/template', id='tmpl-_search')
div.dropdown
input.form-control(name='_search', type='text', placeholder='search', tab-index='1')
Expand All @@ -65,10 +65,10 @@ html
|<% } %>
script(type='text/template', id='tmpl-_search-results-empty-row')
li.dropdown-header no docs matched

//if lte IE 9
script(src='/layouts/ie-sucks.min.js?#{cacheBreaker}')
script(src='/layouts/core.min.js?#{cacheBreaker}')
script(src='/layouts/admin.min.js?#{cacheBreaker}')

block feet
10 changes: 5 additions & 5 deletions layouts/default.jade
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ html
li: a(href='/login/')
i.fa.fa-user
| Sign In

div.page
div.container
block body

div.footer
div.container
span.copyright.pull-right
Expand All @@ -40,12 +40,12 @@ html
li: a(href='/') Home
li: a(href='/contact/') Contact
div.clearfix

div.ajax-spinner
img(src='/media/ajax-pulse.gif')

//if lte IE 9
script(src='/layouts/ie-sucks.min.js?#{cacheBreaker}')
script(src='/layouts/core.min.js?#{cacheBreaker}')

block feet
2 changes: 1 addition & 1 deletion models.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports = module.exports = function(app, mongoose) {
require('./schema/Status')(app, mongoose);
require('./schema/StatusLog')(app, mongoose);
require('./schema/Category')(app, mongoose);

//then regular docs
require('./schema/User')(app, mongoose);
require('./schema/Admin')(app, mongoose);
Expand Down
20 changes: 10 additions & 10 deletions node_modules/drywall-sendmail/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions node_modules/drywall-workflow/index.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 321a276

Please sign in to comment.