Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP commit for CSS static directories

Browse Source
This commit is contained in:
Julian Lam
2013-10-05 22:33:29 -04:00
parent 0b299b2fe7
commit 63ff572076
3 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/meta.js
View File

@@ -215,11 +215,11 @@ var utils = require('./../public/src/utils.js'),
}),
minified;
winston.info('Minifying client-side libraries');
if (process.env.NODE_ENV === 'development') winston.info('Minifying client-side libraries');
minified = uglifyjs.minify(jsPaths);
fs.writeFile(Meta.js.minFile, minified.code, function (err) {
if (!err) {
winston.info('Minified client-side libraries');
if (process.env.NODE_ENV === 'development') winston.info('Minified client-side libraries');
callback();
} else {
winston.error('Problem minifying client-side libraries, exiting.');

15
src/plugins.js
View File

@@ -8,6 +8,7 @@ var fs = require('fs'),
libraries: {},
loadedHooks: {},
staticDirs: {},
cssFiles: [],
// Events
readyEvent: new eventEmitter,
@@ -93,6 +94,7 @@ var fs = require('fs'),
} else next();
},
function(next) {
// Static Directories for Plugins
if (pluginData.staticDir) {
staticDir = path.join(pluginPath, pluginData.staticDir);
@@ -103,6 +105,19 @@ var fs = require('fs'),
} else next();
});
} else next();
},
function(next) {
// CSS Files for plugins
if (pluginData.css && pluginData.css instanceof Array) {
for(var x=0,numCss=pluginData.css.length;x<numCss;x++) {
_self.cssFiles.push({
plugin: pluginData.id,
path: path.join(pluginPath, pluginData.css[x])
});
}
next();
} else next();
}
], function(err) {
if (!err) {

31
src/webserver.js
View File

@@ -120,17 +120,35 @@ var express = require('express'),
next();
},
function(next) {
// Static Directories for NodeBB Plugins
plugins.ready(function () {
for (d in plugins.staticDirs) {
app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
winston.info('Static directory routed for plugin: ' + d);
// Static CSS files for NodeBB Plugins
plugins.ready(function() {
var file,x,numCss,route;
for(x=0,numCss=plugins.cssFiles.length;x<numCss;x++) {
file = plugins.cssFiles[x];
route = path.join(nconf.get('relative_path'), '/css/', file.plugin);
app.use(route, express.static(file.path));
if (process.env.NODE_ENV === 'development') winston.info('Plugin CSS file found: ' + route);
console.log('route', route);
console.log('path', file.path);
}
next();
});
},
function(next) {
// Static Directories for NodeBB Plugins
plugins.ready(function () {
for (d in plugins.staticDirs) {
console.log(plugins.staticDirs[d]);
app.use(nconf.get('relative_path') + '/plugins/' + d, express.static(plugins.staticDirs[d]));
if (process.env.NODE_ENV === 'development') winston.info('Static directory routed for plugin: ' + d);
}
next();
});
},
function(next) {
console.log('router');
// Router & post-router middlewares
app.use(app.router);
@@ -176,8 +194,9 @@ var express = require('express'),
], function(err) {
if (err) {
winston.error('Errors were encountered while attempting to initialise NodeBB.');
process.exit();
} else {
winston.info('Middlewares loaded.');
if (process.env.NODE_ENV === 'development') winston.info('Middlewares loaded.');
}
});
});