From d7dac42a88e9c35125757350791c2b0b2a10dfaf Mon Sep 17 00:00:00 2001 From: Sean Grove Date: Thu, 12 Apr 2012 18:35:43 -0700 Subject: [PATCH] Fixes an emoticon and adds audio tags --- app/assets/javascripts/backbone/plugins/emoticons.js.coffee | 2 +- app/views/layouts/application.html.erb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/backbone/plugins/emoticons.js.coffee b/app/assets/javascripts/backbone/plugins/emoticons.js.coffee index f3da2f70..2c432c81 100644 --- a/app/assets/javascripts/backbone/plugins/emoticons.js.coffee +++ b/app/assets/javascripts/backbone/plugins/emoticons.js.coffee @@ -22,7 +22,7 @@ class Kandan.Plugins.Emoticons "(okay)" : "okay.jpg", "(omgface)" : "omgface.jpg", "(pokerface)" : "pokerface.jpg", - "(problem)" : "problem.jpg", + "(problem)" : "trollface.jpg", "(rageguy)" : "rageguy.jpg", "(seriously)" : "seriously.jpg", "(sweetjesus)" : "sweetjesus.jpg", diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index b8801ec5..2db960d7 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,5 +33,7 @@ <%= yield %> + +