nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small possible fix for conversations

Browse source
This commit is contained in:
Maxwell Salzberg 2011-10-24 13:06:32 -07:00
parent 51778cb22d
commit 4022ff5163
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/conversations_controller.rb
View file

@ -67,7 +67,7 @@ class ConversationsController < ApplicationController
@contact_ids = "" @contact_ids = ""
@contacts_json = all_contacts_and_ids.to_json.gsub!(/(")/, '\\"') @contacts_json = all_contacts_and_ids.to_json
if params[:contact_id] if params[:contact_id]
@contact_ids = current_user.contacts.find(params[:contact_id]).id @contact_ids = current_user.contacts.find(params[:contact_id]).id
elsif params[:aspect_id] elsif params[:aspect_id]

2
app/views/conversations/new.haml
View file

@ -4,7 +4,7 @@
:javascript :javascript
$(document).ready(function () { $(document).ready(function () {
var data = $.parseJSON( "#{@contacts_json}" ), var data = $.parseJSON( "#{escape_javascript(@contacts_json)}" ),
autocompleteInput = $("#contact_autocomplete"); autocompleteInput = $("#contact_autocomplete");
autocompleteInput.autoSuggest(data, { autocompleteInput.autoSuggest(data, {

1
public/stylesheets/vendor/autoSuggest.css vendored
View file

@ -104,6 +104,7 @@ ul.as-selections li.as-selection-item a:active.as-close {
ul.as-selections li.as-original { ul.as-selections li.as-original {
margin-left: 0; margin-left: 0;
list-style: none;
} }
ul.as-selections li.as-original input { ul.as-selections li.as-original input {