From 504e2aac4aa48ff6e8566ebee1ae078e0e612fa3 Mon Sep 17 00:00:00 2001 From: Quinton Marchi Date: Mon, 30 Sep 2013 02:42:34 -0400 Subject: [PATCH] Adds: regex for ports, mini for public/src/forum + Regular expression for port during install + Minification for public/src/forum JS files + Minification for public/src/forum/admin JS files --- src/install.js | 4 +++- src/meta.js | 28 +++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/install.js b/src/install.js index 4f60f6203d..535e578379 100644 --- a/src/install.js +++ b/src/install.js @@ -18,7 +18,9 @@ var async = require('async'), }, { name: 'port', description: 'Port number of your NodeBB', - 'default': 4567 + 'default': 4567, + pattern: /[0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]/, + message: 'Please enter a value betweeen 1 and 65535' }, { name: 'use_port', description: 'Use a port number to access NodeBB?', diff --git a/src/meta.js b/src/meta.js index 97cfe65789..84b98e5167 100644 --- a/src/meta.js +++ b/src/meta.js @@ -160,7 +160,33 @@ var utils = require('./../public/src/utils.js'), 'src/ajaxify.js', 'src/translator.js', 'src/jquery.form.js', - 'src/utils.js' + 'src/utils.js', + 'src/forum/account.js', + 'src/forum/accountedit.js', + 'src/forum/accountheader.js', + 'src/forum/accountsettings.js', + 'src/forum/category.js', + 'src/forum/favourites.js', + 'src/forum/followers.js', + 'src/forum/following.js', + 'src/forum/footer.js', + 'src/forum/login.js', + 'src/forum/recent.js', + 'src/forum/register.js', + 'src/forum/reset.js', + 'src/forum/reset_code.js', + 'src/forum/search.js', + 'src/forum/topic.js', + 'src/forum/unread.js', + 'src/forum/users.js', + 'src/forum/admin/categories.js', + 'src/forum/admin/footer.js', + 'src/forum/admin/groups.js', + 'src/forum/admin/index.js', + 'src/forum/admin/plugins.js', + 'src/forum/admin/themes.js', + 'src/forum/admin/topics.js', + 'src/forum/admin/users' ], minFile: path.join(__dirname, '..', 'public/src/nodebb.min.js'), get: function (callback) {