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

Fix conversation modal on contacts page

Browse source
This commit is contained in:
Steffen van Bergerem 2015-07-03 16:29:23 +02:00
parent 7d32000bd0
commit db00bd1b03
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/app/pages/contacts.js
View file

@ -8,7 +8,8 @@ app.pages.Contacts = Backbone.View.extend({
"click #contacts_visibility_toggle" : "toggleContactVisibility", "click #contacts_visibility_toggle" : "toggleContactVisibility",
"click #chat_privilege_toggle" : "toggleChatPrivilege", "click #chat_privilege_toggle" : "toggleChatPrivilege",
"click #change_aspect_name" : "showAspectNameForm", "click #change_aspect_name" : "showAspectNameForm",
"keyup #contact_list_search" : "searchContactList" "keyup #contact_list_search" : "searchContactList",
"click .conversation_button": "showMessageModal"
}, },
initialize: function(opts) { initialize: function(opts) {
@ -77,6 +78,10 @@ app.pages.Contacts = Backbone.View.extend({
this.stream.search($(e.target).val()); this.stream.search($(e.target).val());
}, },
showMessageModal: function(){
app.helpers.showModal("#conversationModal");
},
setupAspectSorting: function() { setupAspectSorting: function() {
$("#aspect_nav .list-group").sortable({ $("#aspect_nav .list-group").sortable({
items: "a.aspect[data-aspect-id]", items: "a.aspect[data-aspect-id]",

3
app/helpers/contacts_helper.rb
View file

@ -13,8 +13,7 @@ module ContactsHelper
content_tag :i, content_tag :i,
nil, nil,
class: "entypo-mail contacts-header-icon", class: "entypo-mail contacts-header-icon",
title: t("contacts.index.start_a_conversation"), title: t("contacts.index.start_a_conversation")
data: {toggle: "modal", target: "#conversationModal"}
end end
end end
end end