fixed the incrementing aspect ids on the contacts#sharing modal window, showing 'Add to Aspect' button only on the tags and profile pages
This commit is contained in:
parent
a02b9c01c8
commit
709ac44da3
7 changed files with 21 additions and 18 deletions
|
|
@ -2,7 +2,7 @@
|
|||
// licensed under the Affero General Public License version 3 or later. See
|
||||
// the COPYRIGHT file.
|
||||
|
||||
ContactEdit.updateNumber();
|
||||
ContactEdit.updateNumber("<%= @contact.person_id%>");
|
||||
|
||||
var element = $(".add[data-aspect_id=<%= @aspect.id %>][data-person_id=<%= @contact.person_id%>]");
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
// licensed under the Affero General Public License version 3 or later. See
|
||||
// the COPYRIGHT file.
|
||||
|
||||
ContactEdit.updateNumber();
|
||||
ContactEdit.updateNumber("<%= @contact.person_id%>");
|
||||
var element = $(".added[data-aspect_id=<%= @aspect.id %>][data-person_id=<%= @contact.person_id%>]");
|
||||
element.parent().html("<%= escape_javascript(render('aspect_memberships/remove_from_aspect', :aspect => @aspect, :person => @contact.person, :contact => @contact)) %>");
|
||||
element.fadeTo(200,1);
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
// licensed under the Affero General Public License version 3 or later. See
|
||||
// the COPYRIGHT file.
|
||||
|
||||
ContactEdit.updateNumber();
|
||||
$('ul.dropdown_list[data-person_id=<%= @person.id %>] .newItem').before("<%= escape_javascript( render('contacts/aspect_dropdown_list_item', :aspect => @aspect, :person => @person, :contact => @contact)) %>");
|
||||
|
||||
ContactEdit.updateNumber("<%= @person.id %>");
|
||||
$.facebox.close();
|
||||
$('#profile .dropdown').toggleClass("active");
|
||||
|
||||
|
|
|
|||
|
|
@ -8,10 +8,11 @@
|
|||
▼
|
||||
|
||||
.wrapper
|
||||
%ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => ((@person.id) if @person)}
|
||||
%ul.dropdown_list{:unSelectable => 'on', 'data-person_id' => ((person.id) if person)}
|
||||
- for aspect in @all_aspects
|
||||
= aspect_dropdown_list_item(aspect, contact, person)
|
||||
|
||||
%li.newItem
|
||||
.add_aspect
|
||||
= link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox'
|
||||
|
||||
- if defined?(@aspect) && ( @aspect == :profile || @aspect == :tag)
|
||||
%li.newItem
|
||||
.add_aspect
|
||||
= link_to "Add a new aspect", new_aspect_path(:person_id => person.id), :rel => 'facebox'
|
||||
|
|
|
|||
|
|
@ -38,7 +38,8 @@
|
|||
- if current_user
|
||||
- contact = current_user.contacts.find_by_person_id(person.id)
|
||||
- contact ||= Contact.new(:person => person)
|
||||
= render 'contacts/aspect_dropdown', :contact => contact, :person => person, :hang => 'left'
|
||||
.right
|
||||
= render 'contacts/aspect_dropdown', :contact => contact, :person => person, :hang => 'left'
|
||||
|
||||
.content
|
||||
%span.from
|
||||
|
|
|
|||
|
|
@ -8,9 +8,15 @@ var ContactEdit = {
|
|||
ContactEdit.processClick($(this), evt);
|
||||
});
|
||||
},
|
||||
updateNumber: function(){
|
||||
var number = $(".dropdown_list input[type=checkbox]:checked").length
|
||||
var element = $('.button.toggle');
|
||||
updateNumber: function(personId){
|
||||
console.log(personId);
|
||||
var dropdown = $(".dropdown_list[data-person_id=" + personId.toString() +"]")
|
||||
console.log(dropdown);
|
||||
|
||||
var number = dropdown.find("input[type=checkbox]:checked").length
|
||||
|
||||
console.log(number);
|
||||
var element = dropdown.parents(".dropdown").children('.button.toggle');
|
||||
|
||||
var replacement;
|
||||
|
||||
|
|
|
|||
|
|
@ -2837,12 +2837,6 @@ ul.show_comments,
|
|||
:padding 10px 0
|
||||
.avatar
|
||||
:float left
|
||||
.right
|
||||
:display none
|
||||
|
||||
.stream_element:hover
|
||||
.right
|
||||
:display none
|
||||
|
||||
.tag
|
||||
:display inline-block
|
||||
|
|
|
|||
Loading…
Reference in a new issue