From 4022ff5163d9bc1185db32fe6870965f031f1901 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Mon, 24 Oct 2011 13:06:32 -0700
Subject: [PATCH] small possible fix for conversations

---
 app/controllers/conversations_controller.rb | 2 +-
 app/views/conversations/new.haml            | 2 +-
 public/stylesheets/vendor/autoSuggest.css   | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/controllers/conversations_controller.rb b/app/controllers/conversations_controller.rb
index bc1586290..3915be1d6 100644
--- a/app/controllers/conversations_controller.rb
+++ b/app/controllers/conversations_controller.rb
@@ -67,7 +67,7 @@ class ConversationsController < ApplicationController
 
     @contact_ids = ""
 
-    @contacts_json = all_contacts_and_ids.to_json.gsub!(/(")/, '\\"')
+    @contacts_json = all_contacts_and_ids.to_json
     if params[:contact_id]
       @contact_ids = current_user.contacts.find(params[:contact_id]).id
     elsif params[:aspect_id]
diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml
index 6026f09a9..dc8f8c239 100644
--- a/app/views/conversations/new.haml
+++ b/app/views/conversations/new.haml
@@ -4,7 +4,7 @@
 
 :javascript
   $(document).ready(function () {
-    var data = $.parseJSON( "#{@contacts_json}" ),
+    var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" ),
         autocompleteInput = $("#contact_autocomplete");
 
     autocompleteInput.autoSuggest(data, {
diff --git a/public/stylesheets/vendor/autoSuggest.css b/public/stylesheets/vendor/autoSuggest.css
index 3614c924f..14a387e5e 100644
--- a/public/stylesheets/vendor/autoSuggest.css
+++ b/public/stylesheets/vendor/autoSuggest.css
@@ -104,6 +104,7 @@ ul.as-selections li.as-selection-item a:active.as-close {
 
 ul.as-selections li.as-original {
 	margin-left: 0;
+  list-style: none;
 }
 
 ul.as-selections li.as-original input {