From f468170dbee12e34d4f7df3201d20e10a09b56c2 Mon Sep 17 00:00:00 2001 From: Akash Manohar J Date: Wed, 11 Apr 2012 20:25:07 +0530 Subject: [PATCH] Fixes typos Signed-off-by: Akash Manohar J --- app/assets/javascripts/backbone/helpers/users.js.coffee | 2 +- .../javascripts/backbone/plugins/me_announce.js.coffee | 2 +- app/views/layouts/application.html.erb | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/backbone/helpers/users.js.coffee b/app/assets/javascripts/backbone/helpers/users.js.coffee index 69265018..b5d803b0 100644 --- a/app/assets/javascripts/backbone/helpers/users.js.coffee +++ b/app/assets/javascripts/backbone/helpers/users.js.coffee @@ -1,3 +1,3 @@ class Kandan.Helpers.Users @currentUser: ()-> - $.data(document, 'current_user') \ No newline at end of file + $.data(document, 'current-user') \ No newline at end of file diff --git a/app/assets/javascripts/backbone/plugins/me_announce.js.coffee b/app/assets/javascripts/backbone/plugins/me_announce.js.coffee index 1db79981..b9002407 100644 --- a/app/assets/javascripts/backbone/plugins/me_announce.js.coffee +++ b/app/assets/javascripts/backbone/plugins/me_announce.js.coffee @@ -6,6 +6,6 @@ class Kandan.Plugins.MeAnnounce @init: ()-> Kandan.Modifiers.register @options.regex, (message, state)=> message.content = message.content.replace @options.regex, "#{message.user.first_name} " - return Kandan.Helpers.Activities.build_from_base_template(message) + return Kandan.Helpers.Activities.buildFromBaseTemplate(message) # Kandan.Plugins.register "Kandan.Plugins.MeAnnounce" \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f70a5c6b..9825a7c6 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -21,14 +21,11 @@ :gravatar_hash => current_user.gravatar_hash } %> - $.data(document, 'current_user', <%= current_user_data.to_json.html_safe %>); + $.data(document, "current-user", <%= current_user_data.to_json.html_safe %>); <%- end %> + $(document).data("active-users", []) <%- end %> - <%= javascript_tag do %> - $(document).data('active_users', []) - <%- end %> - <%= csrf_meta_tags %>