From d97939a18f3e8c5897f44e124c205258d11fc6c5 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Wed, 30 Mar 2011 21:03:34 +0200
Subject: [PATCH] escape the ' in the json (don't ask me why the four \ are
 needed, it was trial and error :P)

---
 app/views/conversations/new.haml          | 2 +-
 app/views/profiles/_edit_public.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index 1155a7c3d..0ee5d85a0 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -4,7 +4,7 @@
 
 :javascript
   $(document).ready(function () {
-    var data = $.parseJSON( '#{@all_contacts_and_ids.to_json}' ),
+    var data = $.parseJSON( '#{@all_contacts_and_ids.to_json.gsub("'", "\\\\'")}' ),
         autocompleteInput = $("#contact_autocomplete");
 
     autocompleteInput.autoSuggest(data, {
diff --git a/app/views/profiles/_edit_public.html.haml b/app/views/profiles/_edit_public.html.haml
index 53976c130..bad8450f6 100644
--- a/app/views/profiles/_edit_public.html.haml
+++ b/app/views/profiles/_edit_public.html.haml
@@ -7,7 +7,7 @@
 
 :javascript
   $(document).ready(function () {
-    var data = $.parseJSON( '#{@tags_array.to_json}' ),
+    var data = $.parseJSON( '#{@tags_array.to_json.gsub("'", "\\\\'")}' ),
         autocompleteInput = $("#profile_tag_string");