diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index 6bf5a2e04..2c6bc57bc 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -6,7 +6,7 @@ var AspectEdit = { initialize: function() { - $("ul .person.request").draggable({ + $("ul .person").draggable({ revert: true, start: AspectEdit.startDrag, drag: AspectEdit.duringDrag, @@ -148,17 +148,7 @@ var AspectEdit = { }); } } else { - if (confirm("Also remove this person from all aspects?")) { - var person_id = $(this).closest("li.person").attr('data-guid'); - - $.ajax({ - type: "DELETE", - url: "/people/" + person_id, - success: function() { - $(".person[data-guid='"+ person_id +"']").fadeOut(200); - } - }); - } else { + if (confirm("Remove this person from aspect?")) { AspectEdit.deletePersonFromAspect(person); } } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index dcd248b01..32f77c142 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1530,6 +1530,7 @@ h3 span.current_gs_step :color #22C910 #notification + :z-index 10 :display none :position fixed :bottom 21px diff --git a/spec/javascripts/aspect-edit-spec.js b/spec/javascripts/aspect-edit-spec.js index 282107238..7023084e1 100644 --- a/spec/javascripts/aspect-edit-spec.js +++ b/spec/javascripts/aspect-edit-spec.js @@ -27,7 +27,7 @@ describe("AspectEdit", function() { drag: AspectEdit.duringDrag, stop: AspectEdit.stopDrag }); - expect($.fn.draggable.mostRecentCall.object.selector).toEqual("ul .person.request"); + expect($.fn.draggable.mostRecentCall.object.selector).toEqual("ul .person"); }); it("calls droppable on .aspect ul.dropzone", function() { spyOn($.fn, "droppable");