From 0ebb9c874bfee4f279cd1837731b47e2e8b55d27 Mon Sep 17 00:00:00 2001 From: Blade Barringer Date: Sun, 8 Feb 2015 20:19:54 -0600 Subject: [PATCH] Worked on gruntfile --- Gruntfile.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 35b9629fe2..e86ec960b2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -87,9 +87,9 @@ module.exports = function(grunt) { 'website/build/*.js', 'website/build/*.css', 'website/build/favicon.ico', - 'website/build/bower_components/habitrpg-shared/dist/*.png', - 'website/build/bower_components/habitrpg-shared/img/sprites/backer-only/*.gif', - 'website/build/bower_components/habitrpg-shared/img/sprites/npc_ian.gif', + 'website/build/common/dist/sprites/*.png', + 'website/build/common/img/sprites/backer-only/*.gif', + 'website/build/common/img/sprites/npc_ian.gif', 'website/build/bower_components/bootstrap/dist/fonts/*' ], dest: 'website/build/*.css' @@ -132,13 +132,19 @@ module.exports = function(grunt) { var js = uglify['website/build/' + key + '.js'] = []; _.each(files[key].js, function(val){ - js.push('website/public/' + val); + var path = "./"; + if( val.indexOf('common/') == -1) + path = './website/public/'; + js.push(path + val); }); var css = cssmin['website/build/' + key + '.css'] = []; _.each(files[key].css, function(val){ - var path = (val == 'app.css' || val == 'static.css') ? 'website/build/' : 'website/public/'; + var path = "./"; + if( val.indexOf('common/') == -1) { + path = (val == 'app.css' || val == 'static.css') ? './website/build/' : './website/public/'; + } css.push(path + val) });