From 58a09e51f8ea6716456c95fe663ebb9dca2c52d8 Mon Sep 17 00:00:00 2001 From: Martii Date: Mon, 17 Nov 2014 22:20:30 -0700 Subject: [PATCH] Abstract Production vs Development * This is pre-approved by sizzle ... insert into every project .js file * Redirect existing conditionals to use these properties * The debug library may be improved separately in another issue but needs to and should remain the same property usage * Manual fix some of the missing/extra semi-colons found thanks to @jerone since in here ... this is probably incomplete and needs another go around * Manual fix **some** styleguide conformance found by @jerone with missing space * Remove one of my stale line notes Tested on dev okay Closes #428 --- app.js | 10 ++++++-- controllers/_template.js | 10 ++++++-- controllers/admin.js | 12 +++++++--- controllers/auth.js | 10 ++++++-- controllers/discussion.js | 6 +++++ controllers/document.js | 10 ++++++-- controllers/group.js | 10 ++++++-- controllers/index.js | 6 +++++ controllers/issue.js | 14 +++++++---- controllers/moderation.js | 6 +++++ controllers/remove.js | 6 +++++ controllers/script.js | 12 +++++++--- controllers/scriptStorage.js | 12 +++++++--- controllers/user.js | 24 ++++++++++++------- libs/collectiveRating.js | 6 +++++ libs/debug.js | 9 +++++++ libs/flag.js | 8 ++++++- libs/githubClient.js | 6 +++++ libs/helpers.js | 8 ++++++- libs/markdown.js | 8 ++++++- libs/modelParser.js | 8 ++++++- libs/modelQuery.js | 8 ++++++- libs/modifySessions.js | 6 +++++ libs/muExpress.js | 8 ++++++- libs/passportLoader.js | 8 ++++++- libs/passportVerify.js | 6 +++++ libs/remove.js | 6 +++++ libs/repoManager.js | 10 ++++++-- libs/tasks.js | 8 ++++++- libs/templateHelpers.js | 6 +++++ models/discussion.js | 6 +++++ models/flag.js | 6 +++++ models/group.js | 6 +++++ models/remove.js | 6 +++++ models/script.js | 6 +++++ models/strategy.js | 6 +++++ models/user.js | 6 +++++ models/vote.js | 6 +++++ routes.js | 6 +++++ routesStatic.js | 6 +++++ .../includes/scripts/commentReplyScript.html | 6 ++--- 41 files changed, 288 insertions(+), 45 deletions(-) create mode 100644 libs/debug.js diff --git a/app.js b/app.js index a1ee70da5..0f5690d2e 100755 --- a/app.js +++ b/app.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('./libs/debug').isPro; +var isDev = require('./libs/debug').isDev; +var isDbg = require('./libs/debug').isDbg; + +// var express = require('express'); var methodOverride = require('method-override'); var morgan = require('morgan'); @@ -51,7 +57,7 @@ if (app.get('port') === 443) { }); } -if (process.env.NODE_ENV !== 'production') { +if (isDev || isDbg) { app.use(morgan('dev')); } @@ -89,7 +95,7 @@ app.set('views', __dirname + '/views'); // Setup minification // Order is important here as Ace will fail with an invalid content encoding issue -if (process.env.NODE_ENV === 'production') { +if (isPro || isDev) { app.use(minify()); } diff --git a/controllers/_template.js b/controllers/_template.js index 89f32525a..f4dbd90b5 100644 --- a/controllers/_template.js +++ b/controllers/_template.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); var pageMetadata = require('../libs/templateHelpers').pageMetadata; @@ -28,7 +34,7 @@ exports.example = function (aReq, aRes, aNext) { var tasks = []; //--- - function preRender() { }; + function preRender() { } function render() { aRes.render('pages/_templatePage', options); } function asyncComplete() { preRender(); render(); } @@ -57,7 +63,7 @@ exports.example = function (aReq, aRes, aNext) { function preRender() { // Pagination options.paginationRendered = pagination.renderDefault(aReq); - }; + } function render() { aRes.render('pages/_templatePage', options); } function asyncComplete() { preRender(); render(); } diff --git a/controllers/admin.js b/controllers/admin.js index 130af46aa..6e7d0294e 100644 --- a/controllers/admin.js +++ b/controllers/admin.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var exec = require('child_process').exec; @@ -306,11 +312,11 @@ exports.adminNpmLsView = function (aReq, aRes, aNext) { if (!options.isAdmin) return aRes.send(403, { status: 403, message: 'Not an admin.' }); - exec('npm ls --json', function(aErr, aStdout, aStderr) { + exec('npm ls --json', function (aErr, aStdout, aStderr) { if (aErr) return aRes.send(501, { status: 501, message: 'Not implemented.' }); aRes.json(JSON.parse(aStdout)); }); -} +}; // Manage oAuth strategies without having to restart the server // When new keys are added, we load the new strategy @@ -322,7 +328,7 @@ exports.apiAdminUpdate = function (aReq, aRes, aNext) { postStrats = Object.keys(aReq.body).map(function (aPostStrat) { var values = aReq.body[aPostStrat]; - return { name: aPostStrat, id: values[0], key: values[1] } + return { name: aPostStrat, id: values[0], key: values[1] }; }); Strategy.find({}, function (aErr, aStrats) { diff --git a/controllers/auth.js b/controllers/auth.js index 1ff850c45..bf924f2ce 100644 --- a/controllers/auth.js +++ b/controllers/auth.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var passport = require('passport'); var allStrategies = require('./strategies.json'); var loadPassport = require('../libs/passportLoader').loadPassport; @@ -122,7 +128,7 @@ exports.callback = function (aReq, aRes, aNext) { function (aToken, aRefreshOrSecretToken, aProfile, aDone) { aReq.session.profile = aProfile; verifyPassport(aProfile.id, strategy, username, aReq.session.user, aDone); - } + }; } // This callback will happen after the verify routine @@ -161,4 +167,4 @@ exports.callback = function (aReq, aRes, aNext) { }); authenticate(aReq, aRes, aNext); -} +}; diff --git a/controllers/discussion.js b/controllers/discussion.js index 4a9fb3455..175f6989a 100644 --- a/controllers/discussion.js +++ b/controllers/discussion.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); diff --git a/controllers/document.js b/controllers/document.js index 60e5b71f1..3ca123fe6 100644 --- a/controllers/document.js +++ b/controllers/document.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var pkg = require('../package.json'); var fs = require('fs'); @@ -90,7 +96,7 @@ exports.view = function (aReq, aRes, aNext) { aCallback(null); }); } - ], aCallback) + ], aCallback); }); } else { @@ -118,7 +124,7 @@ exports.view = function (aReq, aRes, aNext) { return statusCodePage(aReq, aRes, aNext, { statusCode: aErr.statusCode, statusMessage: aErr.statusMessage - }) + }); } aRes.render('pages/documentPage', options); diff --git a/controllers/group.js b/controllers/group.js index 29997ff1a..0f664f277 100644 --- a/controllers/group.js +++ b/controllers/group.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); @@ -154,7 +160,7 @@ exports.list = function (aReq, aRes) { if (options.groupList) { pageMetadata(options, 'Groups', null, _.pluck(options.groupList, 'name')); } - }; + } function render() { aRes.render('pages/groupListPage', options); } function asyncComplete() { preRender(); render(); } @@ -264,7 +270,7 @@ exports.view = function (aReq, aRes, aNext) { } else if (options.isUserScriptListPage) { options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.'; } - }; + } function render() { aRes.render('pages/groupScriptListPage', options); } function asyncComplete() { preRender(); render(); } diff --git a/controllers/index.js b/controllers/index.js index 932434320..204f7932d 100644 --- a/controllers/index.js +++ b/controllers/index.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); diff --git a/controllers/issue.js b/controllers/issue.js index 68386ccb4..9f53edbbf 100644 --- a/controllers/issue.js +++ b/controllers/issue.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); @@ -126,7 +132,7 @@ exports.list = function (aReq, aRes, aNext) { options.discussionListIsEmptyMessage = 'No closed discussions.'; } } - }; + } function render() { aRes.render('pages/scriptIssueListPage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -146,7 +152,7 @@ exports.view = function (aReq, aRes, aNext) { Script.findOne({ installName: scriptStorage.caseInsensitive( - installNameSlug + (type === 'libs' ? '.js' : '.user.js')) + installNameSlug + (type === 'libs' ? '.js' : '.user.js')) }, function (aErr, aScriptData) { if (aErr || !aScriptData) { return aNext(); } @@ -222,7 +228,7 @@ exports.view = function (aReq, aRes, aNext) { // Pagination options.paginationRendered = pagination.renderDefault(aReq); - }; + } function render() { aRes.render('pages/scriptIssuePage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -244,7 +250,7 @@ exports.open = function (aReq, aRes, aNext) { Script.findOne({ installName: scriptStorage.caseInsensitive( - installNameSlug + (type === 'libs' ? '.js' : '.user.js')) + installNameSlug + (type === 'libs' ? '.js' : '.user.js')) }, function (aErr, aScriptData) { function preRender() { // Page metadata diff --git a/controllers/moderation.js b/controllers/moderation.js index 7a8985770..469c387f8 100644 --- a/controllers/moderation.js +++ b/controllers/moderation.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var async = require('async'); var _ = require('underscore'); diff --git a/controllers/remove.js b/controllers/remove.js index 366ca152a..4d3465df0 100644 --- a/controllers/remove.js +++ b/controllers/remove.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var removeLib = require('../libs/remove'); var Script = require('../models/script').Script; var User = require('../models/user').User; diff --git a/controllers/script.js b/controllers/script.js index 05eeb91fb..921a1c548 100644 --- a/controllers/script.js +++ b/controllers/script.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var fs = require('fs'); var formidable = require('formidable'); var async = require('async'); @@ -13,7 +19,7 @@ var Script = require('../models/script').Script; var Vote = require('../models/vote').Vote; var scriptStorage = require('./scriptStorage'); -var addScriptToGroups = require('./group').addScriptToGroups +var addScriptToGroups = require('./group').addScriptToGroups; var flagLib = require('../libs/flag'); var removeLib = require('../libs/remove'); var modelQuery = require('../libs/modelQuery'); @@ -299,7 +305,7 @@ exports.view = function (aReq, aRes, aNext) { pageMetadata(options, ['About', script.name, (script.isLib ? 'Libraries' : 'Scripts')], script.meta.description, _.pluck(script.groups, 'name')); } - }; + } function render() { aRes.render('pages/scriptPage', options); } function asyncComplete() { preRender(); render(); } @@ -365,7 +371,7 @@ exports.edit = function (aReq, aRes, aNext) { }); options.groupNameListJSON = JSON.stringify(groupNameList); - }; + } function render() { aRes.render('pages/scriptEditMetadataPage', options); } function asyncComplete() { preRender(); render(); } diff --git a/controllers/scriptStorage.js b/controllers/scriptStorage.js index 60a02d40c..a5540da35 100644 --- a/controllers/scriptStorage.js +++ b/controllers/scriptStorage.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var AWS = require('aws-sdk'); var Script = require('../models/script').Script; @@ -11,7 +17,7 @@ var userRoles = require('../models/userRoles.json'); var bucketName = 'OpenUserJS.org'; -if (process.env.NODE_ENV === 'production') { +if (isPro) { AWS.config.update({ region: 'us-east-1' }); } else { // You need to install (and ruby too): https://github.com/jubos/fake-s3 @@ -27,7 +33,7 @@ if (process.env.NODE_ENV === 'production') { }); } -function getInstallName (aReq) { +function getInstallName(aReq) { return aReq.route.params.username + '/' + aReq.route.params.scriptname; } exports.getInstallName = getInstallName; @@ -249,7 +255,7 @@ exports.storeScript = function (aUser, aMeta, aBuf, aCallback, aUpdate) { var requires = null; var collaborators = null; var libraryRegex = new RegExp('^https?:\/\/' + - (process.env.NODE_ENV === 'production' ? + (isPro ? 'openuserjs\.org' : 'localhost:8080') + '\/(?:libs\/src|src\/libs)\/(.+?\/.+?\.js)$', ''); diff --git a/controllers/user.js b/controllers/user.js index ab1d06b32..5e9880afd 100644 --- a/controllers/user.js +++ b/controllers/user.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var fs = require('fs'); var formidable = require('formidable'); var async = require('async'); @@ -210,7 +216,7 @@ exports.userListPage = function (aReq, aRes, aNext) { if (options.isFlagged) { pageMetadata(options, ['Flagged Users', 'Moderation']); } - }; + } function render() { aRes.render('pages/userListPage', options); } function asyncComplete(err) { if (err) { return aNext(); } else { preRender(); render(); } }; async.parallel(tasks, asyncComplete); @@ -269,7 +275,7 @@ exports.view = function (aReq, aRes, aNext) { tasks = tasks.concat(getUserSidePanelTasks(options)); //--- - function preRender() { }; + function preRender() { } function render() { aRes.render('pages/userPage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -353,7 +359,7 @@ exports.userCommentListPage = function (aReq, aRes, aNext) { // Pagination options.paginationRendered = pagination.renderDefault(aReq); - }; + } function render() { aRes.render('pages/userCommentListPage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -445,7 +451,7 @@ exports.userScriptListPage = function (aReq, aRes, aNext) { } else if (options.isUserScriptListPage) { options.scriptListIsEmptyMessage = 'This user hasn\'t added any scripts yet.'; } - }; + } function render() { aRes.render('pages/userScriptListPage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -507,7 +513,7 @@ exports.userEditProfilePage = function (aReq, aRes, aNext) { tasks = tasks.concat(getUserSidePanelTasks(options)); //--- - function preRender() { }; + function preRender() { } function render() { aRes.render('pages/userEditProfilePage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -588,7 +594,7 @@ exports.userEditPreferencesPage = function (aReq, aRes, aNext) { }); // Get OpenId strategies - if (process.env.NODE_ENV === 'production') { + if (isPro) { for (name in strategies) { strategy = strategies[name]; @@ -621,7 +627,7 @@ exports.userEditPreferencesPage = function (aReq, aRes, aNext) { // UserSidePanel tasks tasks = tasks.concat(getUserSidePanelTasks(options)); - function preRender() { }; + function preRender() { } function render() { aRes.render('pages/userEditPreferencesPage', options); } function asyncComplete() { preRender(); render(); } async.parallel(tasks, asyncComplete); @@ -673,7 +679,7 @@ exports.edit = function (aReq, aRes, aNext) { }); // Get OpenId strategies - if (process.env.NODE_ENV === 'production') { + if (isPro) { for (name in strategies) { strategy = strategies[name]; @@ -1201,7 +1207,7 @@ exports.userManageGitHubPage = function (aReq, aRes, aNext) { if (aErr) { return statusCodePage(aReq, aRes, aNext, { statusMessage: aErr - }) + }); } console.log('render'); diff --git a/libs/collectiveRating.js b/libs/collectiveRating.js index dd271546b..9732af4ec 100644 --- a/libs/collectiveRating.js +++ b/libs/collectiveRating.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var Script = require('../models/script').Script; function median(aValues) { diff --git a/libs/debug.js b/libs/debug.js new file mode 100644 index 000000000..9e68d1b6d --- /dev/null +++ b/libs/debug.js @@ -0,0 +1,9 @@ +'use strict'; + +var isPro = process.env.NODE_ENV === 'production'; +var isDev = !isPro; +var isDbg = typeof v8debug === 'object'; + +exports.isPro = isPro; +exports.isDev = isDev; +exports.isDbg = isDbg; diff --git a/libs/flag.js b/libs/flag.js index 78dd97fa4..22139fd44 100644 --- a/libs/flag.js +++ b/libs/flag.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var Flag = require('../models/flag').Flag; var User = require('../models/user').User; var getKarma = require('./collectiveRating').getKarma; @@ -108,7 +114,7 @@ function flag(aModel, aContent, aUser, aAuthor, aCallback) { if (!aContent.flags) { aContent.flags = 0; } if (!aContent.flagged) { aContent.flagged = false; } - saveContent(aModel, aContent, aAuthor, aUser.role < 4 ? 2 : 1, aCallback) + saveContent(aModel, aContent, aAuthor, aUser.role < 4 ? 2 : 1, aCallback); }); } diff --git a/libs/githubClient.js b/libs/githubClient.js index 87e75a7a4..586bd3031 100644 --- a/libs/githubClient.js +++ b/libs/githubClient.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var GitHubApi = require("github"); var _ = require("underscore"); var async = require('async'); diff --git a/libs/helpers.js b/libs/helpers.js index 9b177bbde..a2d0bf099 100644 --- a/libs/helpers.js +++ b/libs/helpers.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var url = require("url"); var _ = require('underscore'); @@ -53,7 +59,7 @@ exports.formatDate = function (aDate) { } return ret; -} +}; // Create an object with no properties exports.nil = function (aObj) { diff --git a/libs/markdown.js b/libs/markdown.js index 0ae78eaa9..ce678925e 100644 --- a/libs/markdown.js +++ b/libs/markdown.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var marked = require('marked'); var hljs = require('highlight.js'); var sanitizeHtml = require('sanitize-html'); @@ -79,7 +85,7 @@ renderer.heading = function (aText, aLevel) { var name = escapedText; var html = ''; - html += '' + html += ''; html += sanitize(aText); html += ''; html += ''; diff --git a/libs/modelParser.js b/libs/modelParser.js index 7d739f44a..d9ec13a1a 100644 --- a/libs/modelParser.js +++ b/libs/modelParser.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var moment = require('moment'); var _ = require('underscore'); var util = require('util'); @@ -24,7 +30,7 @@ var momentLangFromNow = function (aDate) { return '[' + aDate.fromNow() + ']'; }; var momentLangTinyDate = function (aDate) { - if(aDate.year() === moment().year()) { + if (aDate.year() === moment().year()) { return '[' + aDate.format("D MMM") + ']'; } else { return '[' + aDate.format("MMM 'YY") + ']'; diff --git a/libs/modelQuery.js b/libs/modelQuery.js index 88e9d2bb4..f6c8524a0 100644 --- a/libs/modelQuery.js +++ b/libs/modelQuery.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var _ = require('underscore'); var getDefaultPagination = require('../libs/templateHelpers').getDefaultPagination; @@ -35,7 +41,7 @@ var parseModelListSort = function (aModelListQuery, aOrderBy, aOrderDir, aDefaul }; exports.parseModelListSort = parseModelListSort; -var parseSearchConditions = function (aQ, aPrefixSearchFields, aFullSearchFields) { // NOTE: This code is duplicated elsewhere but this is primary +var parseSearchConditions = function (aQ, aPrefixSearchFields, aFullSearchFields) { var conditions = []; var query = null; var prefixStr = ''; diff --git a/libs/modifySessions.js b/libs/modifySessions.js index 232905937..054dee0e6 100644 --- a/libs/modifySessions.js +++ b/libs/modifySessions.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// // This library allows for the modifications of user sessions var async = require('async'); diff --git a/libs/muExpress.js b/libs/muExpress.js index 49a2f0dfc..3efa350da 100644 --- a/libs/muExpress.js +++ b/libs/muExpress.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mu = require('mu2'); mu.root = __dirname + '/../views'; @@ -7,7 +13,7 @@ mu.root = __dirname + '/../views'; function renderFile(aRes, aPath, aOptions) { // If you need to render a file with a different content // type, do it directly on the response object - if (process.env.NODE_ENV !== 'production') { mu.clearCache(); } + if (isDev || isDbg) { mu.clearCache(); } aRes.set('Content-Type', 'text/html; charset=UTF-8'); mu.compileAndRender(aPath, aOptions).pipe(aRes); } diff --git a/libs/passportLoader.js b/libs/passportLoader.js index fd036fcc2..d57335be9 100644 --- a/libs/passportLoader.js +++ b/libs/passportLoader.js @@ -1,11 +1,17 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var passport = require('passport'); var nil = require('../libs/helpers').nil; var AUTH_CALLBACK_BASE_URL = 'http://localhost:' + (process.env.PORT || 8080); -if (process.env.NODE_ENV === 'production') +if (isPro) AUTH_CALLBACK_BASE_URL = 'https://openuserjs.org'; if (process.env.AUTH_CALLBACK_BASE_URL) AUTH_CALLBACK_BASE_URL = process.env.AUTH_CALLBACK_BASE_URL; diff --git a/libs/passportVerify.js b/libs/passportVerify.js index 875a472e6..987e17d02 100644 --- a/libs/passportVerify.js +++ b/libs/passportVerify.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var crypto = require('crypto'); var User = require('../models/user').User; var findDeadorAlive = require('../libs/remove').findDeadorAlive; diff --git a/libs/remove.js b/libs/remove.js index 829611cc9..85d7a4e6c 100644 --- a/libs/remove.js +++ b/libs/remove.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var Remove = require('../models/remove').Remove; var User = require('../models/user').User; var async = require('async'); diff --git a/libs/repoManager.js b/libs/repoManager.js index 09d535e8b..ea9f8a8c2 100644 --- a/libs/repoManager.js +++ b/libs/repoManager.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var https = require('https'); var async = require('async'); var util = require('util'); @@ -113,7 +119,7 @@ RepoManager.prototype.loadScripts = function (aCallback, aUpdate) { }); }, aCallback); }); -} +}; // Create the Mustache object to display repos with their user scrips RepoManager.prototype.makeRepoArray = function () { @@ -138,7 +144,7 @@ RepoManager.prototype.makeRepoArray = function () { } return retOptions; -} +}; // Manages a single repo function Repo(aManager, aUsername, aReponame) { diff --git a/libs/tasks.js b/libs/tasks.js index ac0281210..00ec186aa 100644 --- a/libs/tasks.js +++ b/libs/tasks.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var defaultOnErrFn = console.log; var onErr = function (aErr, aOnErrFn) { @@ -30,7 +36,7 @@ exports.execQueryTask = function (aQuery, aDict, aKey, aOnErrFn) { onErr(aErr, aOnErrFn); aCallback(); } else { - aDict[aKey] = result + aDict[aKey] = result; aCallback(); } }); diff --git a/libs/templateHelpers.js b/libs/templateHelpers.js index 169a66965..4b62d74fd 100644 --- a/libs/templateHelpers.js +++ b/libs/templateHelpers.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var countTask = require('../libs/tasks').countTask; var helpers = require('../libs/helpers'); var modelParser = require('../libs/modelParser'); diff --git a/models/discussion.js b/models/discussion.js index 5434662dc..d264b69b1 100644 --- a/models/discussion.js +++ b/models/discussion.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/flag.js b/models/flag.js index 60630a563..2fa9747f3 100644 --- a/models/flag.js +++ b/models/flag.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/group.js b/models/group.js index 20f1fdf41..f914b9dfa 100644 --- a/models/group.js +++ b/models/group.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; var ObjectId = Schema.Types.ObjectId; diff --git a/models/remove.js b/models/remove.js index c2a492677..e504b2c27 100644 --- a/models/remove.js +++ b/models/remove.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/script.js b/models/script.js index afc988c3a..d04be7ba0 100644 --- a/models/script.js +++ b/models/script.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/strategy.js b/models/strategy.js index e3e0acca5..4ee87238e 100644 --- a/models/strategy.js +++ b/models/strategy.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/user.js b/models/user.js index 72f4c6639..db8d699a3 100644 --- a/models/user.js +++ b/models/user.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/models/vote.js b/models/vote.js index 7bcbd09a7..e1e91bda9 100644 --- a/models/vote.js +++ b/models/vote.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('../libs/debug').isPro; +var isDev = require('../libs/debug').isDev; +var isDbg = require('../libs/debug').isDbg; + +// var mongoose = require('mongoose'); var Schema = mongoose.Schema; diff --git a/routes.js b/routes.js index 3e034db2c..ec0d78df2 100644 --- a/routes.js +++ b/routes.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('./libs/debug').isPro; +var isDev = require('./libs/debug').isDev; +var isDbg = require('./libs/debug').isDbg; + +// var express = require('express'); var main = require('./controllers/index'); diff --git a/routesStatic.js b/routesStatic.js index 1036ec7f1..61fbccef6 100644 --- a/routesStatic.js +++ b/routesStatic.js @@ -1,5 +1,11 @@ 'use strict'; +// Define some pseudo module globals +var isPro = require('./libs/debug').isPro; +var isDev = require('./libs/debug').isDev; +var isDbg = require('./libs/debug').isDbg; + +// var path = require('path'); var url = require('url'); diff --git a/views/includes/scripts/commentReplyScript.html b/views/includes/scripts/commentReplyScript.html index be91e1c6e..6a17ccaa6 100644 --- a/views/includes/scripts/commentReplyScript.html +++ b/views/includes/scripts/commentReplyScript.html @@ -19,7 +19,7 @@ $replyTextarea.text(text); }); - function isElementInViewport (aEl) { + function isElementInViewport(aEl) { //special bonus for those using jQuery if (aEl instanceof jQuery) { aEl = aEl[0]; @@ -36,14 +36,14 @@ } var hasShownReplyForm = false; - function callback (aEl) { + function callback(aEl) { if (!hasShownReplyForm) { $('#reply-control').collapse('show'); hasShownReplyForm = true; } } - function fireIfElementVisible (aEl, aCallback) { + function fireIfElementVisible(aEl, aCallback) { return function () { if ( isElementInViewport(aEl) ) { aCallback(aEl);