Merge branch 'hover_item_bug_fix' of git@github.com:baphled/salad int…

…o lighthouse_integration
baphled · May 30, 2010 · dc29db0 · dc29db0
2 parents 13ebdce + 65f3a2a
commit dc29db0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/app/views/features/show.rjs.erb b/app/views/features/show.rjs.erb
@@ -1,4 +1,3 @@
 $('div.list').replaceWith("<%= escape_javascript(render :partial => '/common/sortable_list',:locals => {:models => @feature_stories, :item_name => 'story', :assoc => 'step', :order =>true})%>");
 $('div#lists ul').customSortable();
-$('div#sidebar').html("<%= escape_javascript(render :partial => '/common/sidebar_list_content', :locals => {:models => @feature_stories, :assoc => 'steps'})%>");
-$.include('/javascripts/item_hover.js');
+$('div#sidebar').html("<%= escape_javascript(render :partial => '/common/sidebar_list_content', :locals => {:models => @feature_stories, :assoc => 'steps'})%>");
diff --git a/app/views/projects/show.rjs.erb b/app/views/projects/show.rjs.erb
@@ -1,4 +1,3 @@
 $('div.list').replaceWith("<%= escape_javascript(render :partial => '/common/sortable_list',:locals => {:models => @project_features, :item_name => 'feature', :assoc => 'step', :order =>true})%>");
 $('div#lists ul').customSortable();
-$('div#sidebar').html("<%= escape_javascript(render :partial => 'common/sidebar_list_content', :locals => {:models => @project_features, :assoc => 'stories'})%>");
-$.include('/javascripts/item_hover.js');
+$('div#sidebar').html("<%= escape_javascript(render :partial => 'common/sidebar_list_content', :locals => {:models => @project_features, :assoc => 'stories'})%>");
diff --git a/app/views/stories/index.rjs.erb b/app/views/stories/index.rjs.erb
@@ -1 +1,7 @@
-$('#list').html("<%= escape_javascript(render :partial => '/common/sortable_list',:locals => {:models => @stories, :item_name => 'story', :assoc => 'step', :order =>false})%>");
+$('div.list')
+  .html("<%= escape_javascript(render :partial => '/common/sortable_list',
+                                 :locals => {
+                                   :models => @stories,
+                                   :item_name => 'story',
+                                   :assoc => 'step',
+                                   :order =>false})%>");
diff --git a/public/javascripts/item_hover.js b/public/javascripts/item_hover.js
@@ -7,8 +7,5 @@ $(document).ready(function() {
     $($hover_class).toggle();
   };
 
-  $("div.list_item").each(function(event) {
-    $(this).mouseover(hoverItem);
-    $(this).mouseout(hoverItem);
-  });
+  $("div.list_item").live('mouseover mouseout', hoverItem);
 });