From fd0f3a9a1c845b9ecf3b40c36e7bd62c0554d67f Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 1 Nov 2010 17:30:10 -0700 Subject: [PATCH] Fix reshare, user_menu --- public/javascripts/stream.js | 8 ++++++-- public/javascripts/view.js | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js index eacccf0ea..ede3fa652 100644 --- a/public/javascripts/stream.js +++ b/public/javascripts/stream.js @@ -43,8 +43,12 @@ $(document).ready(function(){ // reshare button action $stream.delegate(".reshare_button", "click", function(evt){ evt.preventDefault(); - $(this).toggleClass("active") - .closest(".reshare_pane").children(".reshare_box").toggle(); + button = $(this) + box = button.siblings(".reshare_box"); + if(box.length > 0){ + button.toggleClass("active"); + box.toggle(); + } }); });//end document ready diff --git a/public/javascripts/view.js b/public/javascripts/view.js index d06813cc1..aa20805ba 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -64,11 +64,11 @@ $(document).ready(function(){ }); $('body').click( function(event){ - var $this = $(this); - if(!$this.closest('#user_menu').length){ + var target = $(event.target); + if(!target.closest('#user_menu').length){ $("#user_menu").removeClass("active"); }; - if(!$this.closest('.reshare_pane').length){ + if(!target.closest('.reshare_pane').length){ $(".reshare_button").removeClass("active"); $(".reshare_box").hide(); };