diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index 0ca141cbee7c57532984d0e0eb057b07ec857ac6..33d410d93b604ed397116e0da8375ddbf0ae6bc5 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -2,8 +2,6 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -= hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json - %h4 .right = link_to t('contacts', :count => @contact_count), manage_aspects_path, :title => t('aspects.manage.manage_aspects') diff --git a/app/views/conversations/new.haml b/app/views/conversations/new.haml index 76e1ec1228495c840deb979c5abd2f0035be0f5c..1155a7c3d1f3715380bd7fce3c5ded3c0678ddd3 100644 --- a/app/views/conversations/new.haml +++ b/app/views/conversations/new.haml @@ -4,7 +4,7 @@ :javascript $(document).ready(function () { - var data = $.parseJSON( $('#contact_json').val() ), + var data = $.parseJSON( '#{@all_contacts_and_ids.to_json}' ), autocompleteInput = $("#contact_autocomplete"); autocompleteInput.autoSuggest(data, { @@ -23,7 +23,6 @@ autocompleteInput.focus(); }); -= hidden_field_tag :contact_json, @all_contacts_and_ids.to_json #new_message_pane .span-12.last diff --git a/app/views/profiles/_edit_public.html.haml b/app/views/profiles/_edit_public.html.haml index 2967f4d610cfaaf88481fc968c438386abdb903d..53976c13097e970a0548172782f87c83af625909 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_json').val() ), + var data = $.parseJSON( '#{@tags_array.to_json}' ), autocompleteInput = $("#profile_tag_string"); @@ -22,7 +22,7 @@ minChars: 2, keyDelay: 0, startText: "#{t('profiles.edit.your_tags_placeholder')}", - emptyText: '#{t('no_results')}', + emptyText: "#{t('no_results')}", preFill: data }); @@ -36,7 +36,6 @@ }); -= hidden_field_tag :tags_json, @tags_array.to_json %h3 = t('profiles.edit.your_public_profile') diff --git a/app/views/shared/_publisher.html.haml b/app/views/shared/_publisher.html.haml index 00b8e17f312c8672f0bb3f8b673838a18454fb07..3bab72762da7b2667858de7b053dc16d38ad73df 100644 --- a/app/views/shared/_publisher.html.haml +++ b/app/views/shared/_publisher.html.haml @@ -20,6 +20,8 @@ .content_creation = form_for(StatusMessage.new, :remote => true, :html => {"data-type" => "json"}) do |status| + - if @selected_contacts + = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json = status.error_messages #file-upload = image_tag 'icons/photos.png' diff --git a/app/views/status_messages/bookmarklet.html.haml b/app/views/status_messages/bookmarklet.html.haml index 6df5ed922a6971334a6a882289412353513ecae3..e25248aa4b9fcc33e6a93d617ff12934e15f94a4 100644 --- a/app/views/status_messages/bookmarklet.html.haml +++ b/app/views/status_messages/bookmarklet.html.haml @@ -31,7 +31,6 @@ }); #new_status_message_pane - = hidden_field_tag :contact_json, @selected_contacts.map{|contact| contact.person}.to_json .span-15.last #facebox_header %h4