Merge branch '2.3_branch'

This commit is contained in:
Dan Rice 2015-06-14 18:20:08 -04:00
commit 8dd4970b0c
6 changed files with 36 additions and 10 deletions

View file

@ -28,7 +28,7 @@ function show_empty_messages() {
}
function remove_todo_from_page() {
<% if (@remaining_in_context == 0) && update_needs_to_hide_container
<% if update_needs_to_hide_container
# remove context with deleted todo
-%>
$('#<%=item_container_id(@todo)%>').fadeOut(400, function() {

View file

@ -34,7 +34,7 @@ var <%= object_name %> = {
redirect_to(path);
},
remove_todo: function(next_steps) {
<% if (@remaining_in_context == 0) && update_needs_to_hide_container
<% if update_needs_to_hide_container
# remove context with deleted todo
-%>
$('#<%= item_container_id(@original_item)%>').slideUp(400, function() {