diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index 29a02961d..7c05e2e0f 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -24,7 +24,6 @@ var Stream = { Diaspora.page.subscribe("stream/scrolled", Stream.collapseText); Stream.collapseText('eventID', $(Stream.selector)[0]); - Stream.bindHideIcon(); }, collapseText: function(){ elements = $(Array.prototype.slice.call(arguments,1)); @@ -58,6 +57,15 @@ var Stream = { } }); + // ajax-loader and hide icon visibility handling for post hide and unhide + $("a.stream_element_delete.vis_hide").live("click", function(evt){ + $(this).toggleClass("hidden"); + $(this).next("img.hide_loader").toggleClass("hidden"); + }); + $("a.stream_element_hide_undo").live("click", function(evt){ + $(this).closest('.stream_element').find("img.hide_loader").toggleClass("hidden"); + }); + // this.setUpComments(); }, @@ -148,15 +156,6 @@ var Stream = { } }, - bindHideIcon: function(){ - $("a.stream_element_delete.vis_hide").live("click", function(evt){ - $(this).toggleClass("hidden"); - $(this).next("img.hide_loader").toggleClass("hidden"); - }); - $("a.stream_element_hide_undo").live("click", function(evt){ - $(this).closest('.stream_element').find("img.hide_loader").toggleClass("hidden"); - }); - } }; $(document).ready(function() { diff --git a/spec/javascripts/stream-spec.js b/spec/javascripts/stream-spec.js index 41421a052..55230dac0 100644 --- a/spec/javascripts/stream-spec.js +++ b/spec/javascripts/stream-spec.js @@ -30,7 +30,7 @@ describe("Stream", function() { describe("streamElement", function() { it("makes sure that ajax spinner appears when hiding a post", function() { - Stream.bindHideIcon(); + Stream.initializeLives(); link = $("a.stream_element_delete.vis_hide"); spinner = link.next("img.hide_loader"); expect(link).not.toHaveClass("hidden");