Merge branch 'master' of github.com:fredwu/angel_nest

jacobdanner · Jul 16, 2011 · 622453d · 622453d
2 parents f7b40c8 + 5f2752c
commit 622453d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/app/assets/javascripts/concerns/editable.js.coffee b/app/assets/javascripts/concerns/editable.js.coffee
@@ -109,6 +109,8 @@ jQuery ->
   )
 
   $('.inline_edtiable_container').delegate('form', 'submit', ->
+    return true if $(@).parents('.follow_button').length > 0
+
     inline_popup = $(@).parent().hasClass('inline_popup')
     edit_target  = $(@).parent().parent()
     target_link  = edit_target.data('target_link')