removing "pluginCSS", "css" in plugins is now included directly into stylesheet.css. This is a breaking change.

fixes #1168
This commit is contained in:
Julian Lam
2014-03-06 17:50:15 -05:00
parent 958e85a31f
commit 5880590425
4 changed files with 12 additions and 18 deletions

View File

@@ -62,6 +62,8 @@ var fs = require('fs'),
Plugins.loadedHooks = {};
Plugins.staticDirs = {};
Plugins.cssFiles.length = 0;
Plugins.lessFiles.length = 0;
Plugins.clientScripts.length = 0;
// Read the list of activated plugins and require their libraries
async.waterfall([
@@ -195,21 +197,12 @@ var fs = require('fs'),
winston.info('[plugins] Found ' + pluginData.css.length + ' CSS file(s) for plugin ' + pluginData.id);
}
if (!pluginData.staticDir) {
Plugins.cssFiles = Plugins.cssFiles.concat(pluginData.css.map(function(file) {
return path.join('/plugins', file);
}));
} else {
winston.warn('[plugins/' + pluginData.id + '] staticDir is deprecated, define CSS files with new staticDirs instead.');
Plugins.cssFiles = Plugins.cssFiles.concat(pluginData.css.map(function(file) {
return path.join('/plugins', pluginData.id, file);
}));
}
next();
} else {
next();
Plugins.cssFiles = Plugins.cssFiles.concat(pluginData.css.map(function(file) {
return path.join(pluginData.id, file);
}));
}
next();
},
function(next) {
// LESS files for plugins