From fef858d5556cc65396e9d6f3c1f4f18218ca7fef Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Wed, 12 Feb 2014 15:21:40 +0100 Subject: [PATCH] refactor(caching): cache emojis and remove gemoji from bower --- bower.json | 1 - src/server.js | 2 ++ views/options/social/challenge-box.jade | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bower.json b/bower.json index e9f2e6ae37..4af780151c 100644 --- a/bower.json +++ b/bower.json @@ -36,7 +36,6 @@ "JavaScriptButtons": "git://github.com/paypal/JavaScriptButtons.git#master", "Angular-At-Directive": "git://github.com/snicker/Angular-At-Directive#master", "js-emoji": "git://github.com/snicker/js-emoji#master", - "gemoji": "git://github.com/github/gemoji", "sticky": "*", "swagger-ui": "https://github.com/wordnik/swagger-ui.git#105c516f5f055b140e935e9cfe0c36f841921dff", "ngInfiniteScroll": "~1.0.0", diff --git a/src/server.js b/src/server.js index 6cefab8db0..bef7642207 100644 --- a/src/server.js +++ b/src/server.js @@ -116,7 +116,9 @@ if (cluster.isMaster && (isDev || isProd)) { app.use(app.router); 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'](path.join(__dirname, "/../public/bower_components/habitrpg-shared/img/emoji/unicode"), { maxAge: maxAge })); app.use(express['static'](path.join(__dirname, "/../public"))); // Custom Directives diff --git a/views/options/social/challenge-box.jade b/views/options/social/challenge-box.jade index ff7cb21926..758a28ece3 100644 --- a/views/options/social/challenge-box.jade +++ b/views/options/social/challenge-box.jade @@ -14,8 +14,8 @@ p |  =env.t('noChallenges') + |  a.label.label-primary(ui-sref='options.social.challenges') - |  span.glyphicon.glyphicon-bullhorn |  =env.t('challenges')