Todo editing and deletion working beautifully.

Removing UJS caused the home page to stop rendering due to references to
apply_behavior. I had to take care of that before I could proceed at all.

Some Autocomplete stuff has been yanked out and needs to go back in at some point.

Had to replace Protoload with jQuery.blockUI. It's a bit bigger, but oh well.

app/helpers/todos_helper.rb

@@ -8,8 +8,9 @@ module TodosHelper
   end
 
   def form_remote_tag_edit_todo( &block )
-    form_tag( 
-      todo_path(@todo), {
+    form_remote_tag(
+      :url => todo_path(@todo),
+      :html => {
         :method => :put, 
         :id => dom_id(@todo, 'form'), 
         :class => dom_id(@todo, 'form') + " inline-form edit_todo_form" }, 
@@ -29,7 +30,7 @@ module TodosHelper
       :method => 'get',
       :with => "'#{parameters}'",
       :before => todo_start_waiting_js(todo),
-      :complete => todo_stop_waiting_js)
+      :complete => todo_stop_waiting_js(todo))
   end
 
   def remote_delete_menu_item(parameters, todo)
@@ -39,7 +40,7 @@ module TodosHelper
       :method => 'delete',
       :with => "'#{parameters}'",
       :before => todo_start_waiting_js(todo),
-      :complete => todo_stop_waiting_js)
+      :complete => todo_stop_waiting_js(todo))
   end
 
   def remote_defer_menu_item(days, todo)
@@ -58,16 +59,16 @@ module TodosHelper
         image_tag("defer_#{days}_off.png", :mouseover => "defer_#{days}.png", :alt => "", :align => "absmiddle")+" Defer #{pluralize(days, "day")}",
         :url => url,
         :before => todo_start_waiting_js(todo),
-        :complete => todo_stop_waiting_js)
+        :complete => todo_stop_waiting_js(todo))
     end
   end
 
   def todo_start_waiting_js(todo)
-    return "$('ul#{dom_id(todo)}').hide(); itemContainer = $('#{dom_id(todo)}'); itemContainer.startWaiting()"
+    return "$('#ul#{dom_id(todo)}').css('visibility', 'hidden'); $('##{dom_id(todo)}').block({message: null})"
   end
 
-  def todo_stop_waiting_js
-    return "itemContainer.stopWaiting();"
+  def todo_stop_waiting_js(todo)
+    return "$('##{dom_id(todo)}').unblock();"
   end
 
   def image_tag_for_recurring_todo(todo)

app/views/contexts/_context.rhtml

@@ -3,25 +3,6 @@
   <h2>
     <% if collapsible -%>
       <a href="#" class="container_toggle" id="toggle_c<%= context.id %>"><%= image_tag("collapse.png") %></a>
-      <% apply_behavior '.container_toggle:click', :prevent_default => true do |page|
-        page << " /* only handle the click if a previous click had finished its animation */
-        if (todoItems.lastEffect == null  || todoItems.lastEffect.state=='finished') {
-        containerElem = this.up('.container')
-        toggleTarget = containerElem.down('.toggle_target')
-        if (Element.visible(toggleTarget))
-        {
-        todoItems.collapseNextActionListing(toggleTarget);
-        $.cookie(todoItems.buildCookieName(containerElem), true);
-        }
-        else
-        {
-        todoItems.expandNextActionListing(toggleTarget);
-        $.cookie(todoItems.buildCookieName(containerElem), null);
-        }
-        }
-        "
-      end
-    -%>
     <% end -%>
     <% if source_view_is :context %>
       <span class="in_place_editor_field" id="context_name_in_place_editor"><%= context.name %></span>

app/views/layouts/standard.html.erb

@@ -13,12 +13,12 @@
       <%= javascript_include_tag 'jquery' %>
       <%= javascript_include_tag 'jquery-ui' %>
       <%= javascript_include_tag 'jquery.cookie' %>
+      <%= javascript_include_tag 'jquery.blockUI' %>
     <% end %>
     <% bundle :name => "tracks_js" do %>
       <%= javascript_include_tag *%w[
       hoverIntent superfish application
-      accesskey-hints niftycube
-      protoload flashobject ] %>
+      accesskey-hints niftycube flashobject ] %>
     <% end %>
     <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
     <%= javascript_tag "var SOURCE_VIEW = '#{@source_view}';" %>

app/views/shared/_add_new_item_form.rhtml

@@ -9,12 +9,6 @@
 
   <div id="toggle_action_new" class="hide_form">
     <a title="Hide new action form" accesskey="n" href="#">&laquo; Hide form</a>
-    <%  apply_behavior '#toggle_action_new a:click', :prevent_default => true do |page|
-      page << "TracksForm.toggle('toggle_action_new', 'todo_new_action', 'todo-form-new-action',
-      '&laquo; Hide form', 'Hide next action form',
-      'Add a next action &#187;', 'Add a next action');"
-    end
-    -%>
   </div>
 
   <div id="todo_new_action" style="display:block">

app/views/todos/_edit_form.rhtml

@@ -14,42 +14,12 @@
   <label for="<%= dom_id(@todo, 'project_name') %>">Project</label>
   <input id="<%= dom_id(@todo, 'project_name') %>" name="project_name" autocomplete="off" tabindex="10" size="30" type="text" value="<%= @todo.project.nil? ? 'None' : @todo.project.name.gsub(/"/,"&quot;") %>" />
   <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'project_list') %>" style="display:none"></div>
-
-  <script type="text/javascript">
-  <%= dom_id(@todo, 'project_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'project_name') %>', '<%= dom_id(@todo, 'project_list') %>', projectNames, {choices:100,autoSelect:false});
-  function selectDefaultContext() {
-    todoContextNameElement = $('<%= dom_id(@todo, 'context_name') %>');
-    defaultContextName = $('todo_context_name').projectDefaultContextsMap[this.value];
-    if (defaultContextName && !todoContextNameElement.editedByTracksUser) {
-      todoContextNameElement.value = defaultContextName;
-    }
-  }
-  function selectDefaultTags() {
-      todoTagListElement = $('<%= dom_id(@todo, 'tag_list') %>');
-      defaultTagList = $('tag_list').projectDefaultTagsMap[this.value];
-      if (defaultTagList && !todoTagListElement.editedByTracksUser) {
-          todoTagListElement.value = defaultTagList;
-      }
-  }
-  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "focus", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
-  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "click", <%= dom_id(@todo, 'project_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'project_autocompleter') %>));
-  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "blur", selectDefaultContext.bind($('<%= dom_id(@todo, 'project_name') %>')));
-  Event.observe($('<%= dom_id(@todo, 'project_name') %>'), "blur", selectDefaultTags.bind($('<%= dom_id(@todo, 'project_name') %>')));
-  </script>
 </div>
 
 <div class="context_input">
   <label for="<%= dom_id(@todo, 'context_name') %>">Context</label>
   <input id="<%= dom_id(@todo, 'context_name') %>" name="context_name" autocomplete="off" tabindex="11" size="30" type="text" value="<%= @todo.context.name %>" />
   <div class="page_name_auto_complete" id="<%= dom_id(@todo, 'context_list') %>" style="display:none"></div>
-
-  <script type="text/javascript">
-  <%= dom_id(@todo, 'context_autocompleter') %> = new Autocompleter.Local('<%= dom_id(@todo, 'context_name') %>', '<%= dom_id(@todo, 'context_list') %>', contextNames, {choices:100,autoSelect:false});
-  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", function(){ $('<%= dom_id(@todo, 'context_name') %>').editedByTracksUser = true; });
-  Event.observe($('<%= dom_id(@todo, 'tag_list') %>'), "focus", function(){ $('<%= dom_id(@todo, 'tag_list') %>').editedByTracksUser = true; });
-  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "focus", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
-  Event.observe($('<%= dom_id(@todo, 'context_name') %>'), "click", <%= dom_id(@todo, 'context_autocompleter') %>.activate.bind(<%= dom_id(@todo, 'context_autocompleter') %>));
-  </script>
 </div>
 
 <label class="tag_list_label" for="<%= dom_id(@todo, 'tag_list') %>">Tags (separate with commas)</label>
@@ -86,20 +56,9 @@
       <%=image_tag("accept.png", :alt => "") %>
       Update
     </button>
-    <a href="javascript:void(0);" onclick="Element.toggle('<%= dom_id(@todo, 'line') %>');Element.toggle('<%= dom_id(@todo, 'edit') %>');" class="negative">
+    <a href="#" class="negative">
       <%=image_tag("cancel.png", :alt => "") %>
       Cancel
     </a>
   </div>
 </div>
-
-<%= calendar_setup( dom_id(@todo, 'due') ) %>
-<%= calendar_setup( dom_id(@todo, 'show_from') ) %>
-
-<script>
-  jQuery(function(){ 
-    jQuery(".date_clear").click(function() {
-      /* add behavior to clear the date both buttons for show_from and due */
-      jQuery(this).prev().val('');
-    })})
-</script>

app/views/todos/_todo.html.erb

@@ -8,7 +8,7 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
 @z_index_counter = @z_index_counter - 1  # for IE z-index bug
 %>
 <div id="<%= dom_id(todo) %>" class="item-container">
-  <div id="<%= dom_id(todo, 'line') %>">
+  <div id="<%= dom_id(todo, 'line') %>" class="item-show">
     <%= remote_star_icon %>
     <%= remote_toggle_checkbox unless source_view_is :deferred %>
     <ul class="sf-menu sf-item-menu"><li style="z-index:<%=@z_index_counter%>"><%= image_tag "downarrow.png", :alt=> "" %><ul id="ul<%= dom_id(todo) %>">
@@ -37,4 +37,4 @@ parameters += "&_tag_name=#{@tag_name}" if @source_view == 'tag'
       <div class="placeholder"> </div>
     <% end -%>
   </div>
-</div>
+</div>

app/views/todos/edit.js.rjs

@@ -1,4 +1,4 @@
-page[dom_id(@todo, 'form')].down('.placeholder').replace_html :partial => 'todos/edit_form'
-page[dom_id(@todo, 'line')].hide
+page[dom_id(@todo, 'form')].find('.placeholder').show().replace_html :partial => 'todos/edit_form'
 page[dom_id(@todo, 'edit')].show
-page[dom_id(@todo, 'form')].down('input#todo_description').focus
+page[dom_id(@todo, 'line')].hide
+page[dom_id(@todo, 'form')].find('input#todo_description').show().focus