@@ -9,7 +9,7 @@
<div class="taskItemContent">
<% if task_item.can_be_changed_by(@logged_user) %>
<div class="taskControls">
- <%= link_to render_icon('trash', 'Trash'), task_path(:id => task_item.id, :task_list_id => task_item.task_list_id), {:confirm => :task_delete_confirm.l, :class => 'blank taskDelete'} %><%= link_to 'Edit', edit_task_path(:id => task_item.id, :task_list_id => task_item.task_list_id), {:class => 'blank taskEdit edit'} %>
+ <%= link_to render_icon('trash', 'Trash'), task_path(:id => task_item.id, :task_list_id => task_item.task_list_id), {:aconfirm => :task_delete_confirm.l, :class => 'blank taskDelete'} %><%= link_to 'Edit', edit_task_path(:id => task_item.id, :task_list_id => task_item.task_list_id), {:class => 'blank taskEdit edit'} %>
</div>
<% end %>
<% if task_item.can_be_changed_by(@logged_user) %>
app/views/tasks/_show.html.erb
@@ -204,13 +204,10 @@ function bindDynamic() {
return false;
});
- $('.taskList .taskDelete').each(function() {
- this.onclick_fn = this.onclick;
- this.onclick = null;
- });
$('.taskList .taskDelete').click(function(evt) {
- if (this.onclick_fn())
- $.del(this.href, null, JustRebind, 'script');
+ var el = $(this);
+ if (confirm(el.attr('aconfirm')))
+ $.del(this.href, null, JustRebind, 'script');
return false;
});
@@ -339,7 +336,8 @@ function rebindDynamic() {
$('.taskItem form').unbind();
$('.taskItem form .cancel').unbind();
$('.taskList .completion').unbind();
- $('.taskList .itemDelete').unbind();
+ $('.taskList .taskEdit').unbind();
+ $('.taskList .taskDelete').unbind();
$('.doSortTaskList').unbind();
$('.doEditTaskList').unbind();
public/javascripts/application.js
79a80039347c87c4eeada9ac6d22806650983677
jamesu
jamesu@gmail.com
http://github.com/jamesu/railscollab/commit/231040f7c7ed1fdcfa7d9609f260621276aa97e9
231040f7c7ed1fdcfa7d9609f260621276aa97e9
2009-11-05T04:42:04-08:00
2009-11-05T04:42:04-08:00
Task deletion now implemented correctly. Closes #gh-22
- 0_0
da536bd627b07b97c3090586b9c6275d900a8f08
jamesu
jamesu@gmail.com