Corrected some paths to serve files directly from comon

This commit is contained in:
Blade Barringer 2015-02-04 12:25:14 -06:00
parent aba56bd174
commit 5d9cda3b76
4 changed files with 6 additions and 5 deletions

View file

@ -20,7 +20,7 @@
// }
});
emoji.img_path = 'bower_components/habitrpg-shared/img/emoji/unicode/';
emoji.img_path = 'common/img/emoji/unicode/';
var toHtml = function (markdown) {
if (markdown == undefined)

View file

@ -1 +0,0 @@
../../common/audio

View file

@ -32,7 +32,7 @@
"bower_components/jquery-ui/ui/minified/jquery.ui.mouse.min.js",
"bower_components/jquery-ui/ui/minified/jquery.ui.sortable.min.js",
"common/habitrpg-shared.js",
"common/scripts/habitrpg-shared.js",
"js/env.js",
@ -79,7 +79,7 @@
"static": {
"js": [
"bower_components/jquery/dist/jquery.min.js",
"habitrpg-shared.js",
"common/scripts/habitrpg-shared.js",
"bower_components/angular/angular.js",
"bower_components/angular-ui/build/angular-ui.js",
"bower_components/angular-bootstrap/ui-bootstrap.js",

View file

@ -116,7 +116,9 @@ if (cores!==0 && cluster.isMaster && (isDev || isProd)) {
var maxAge = isProd ? 31536000000 : 0;
// Cache emojis without copying them to build, they are too many
app.use(express['static'](path.join(__dirname, "/../build"), { maxAge: maxAge }));
app.use('/bower_components/habitrpg-shared/img/emoji/unicode', express['static'](publicDir + "/bower_components/habitrpg-shared/img/emoji/unicode", { maxAge: maxAge }));
app.use('/common', express['static'](publicDir + "/../../common/dist", { maxAge: maxAge }));
app.use('/common/audio', express['static'](publicDir + "/../../common/audio", { maxAge: maxAge }));
app.use('/common/img/emoji/unicode', express['static'](publicDir + "/../../common/img/emoji/unicode", { maxAge: maxAge }));
app.use(express['static'](publicDir));
// Custom Directives