refactored too

11 files changed, 56 insertions, 53 deletions

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 06063b16371..ba18bfa0cec 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -540,7 +540,7 @@ input.ssh_project_url {
   font-size:14px;
 }
 
-.wall_page {
+#new_note {
   #note_note {
     height:25px;
   }
diff --git a/app/controllers/commits_controller.rb b/app/controllers/commits_controller.rb
index 79b97ed7594..f6af56f8aac 100644
--- a/app/controllers/commits_controller.rb
+++ b/app/controllers/commits_controller.rb
@@ -28,12 +28,15 @@ class CommitsController < ApplicationController
 
   def show
     @commit = project.repo.commits(params[:id]).first
-    @notes = project.notes.where(:noteable_id => @commit.id, :noteable_type => "Commit")
+    @notes = project.notes.where(:noteable_id => @commit.id, :noteable_type => "Commit").order("created_at DESC").limit(20)
     @note = @project.notes.new(:noteable_id => @commit.id, :noteable_type => "Commit")
 
-    respond_to do |format|
-      format.html # show.html.erb
-      format.js
+    respond_to do |format| 
+      format.html
+      format.js do 
+        @notes = @notes.where("id > ?", params[:last_id]) if params[:last_id]
+        @notes = @notes.where("id < ?", params[:first_id]) if params[:first_id]
+      end
     end
   end
 end
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 71c559a1346..b6fd85b848f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -35,8 +35,16 @@ class IssuesController < ApplicationController
   end
 
   def show
-    @notes = @issue.notes.order("created_at ASC")
+    @notes = @issue.notes.order("created_at DESC").limit(20)
     @note = @project.notes.new(:noteable => @issue)
+
+    respond_to do |format| 
+      format.html
+      format.js do 
+        @notes = @notes.where("id > ?", params[:last_id]) if params[:last_id]
+        @notes = @notes.where("id < ?", params[:first_id]) if params[:first_id]
+      end
+    end
   end
 
   def create
diff --git a/app/views/commits/show.js.haml b/app/views/commits/show.js.haml
index 9831bb29576..ee31c0b8d3c 100644
--- a/app/views/commits/show.js.haml
+++ b/app/views/commits/show.js.haml
@@ -1,8 +1 @@
--#:plain
-  $("#side-commit-preview").remove();
-  var side = $("<div id='side-commit-preview'></div>");
-  side.html("#{escape_javascript(render "commits/show")}");
-  $("##{dom_id(@project)}").parent().append(side);
-  $("##{dom_id(@project)}").addClass("span-14");
-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index 371a8033190..669784ba116 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -1,8 +1,10 @@
 %h2
   = "Issue ##{@issue.id} - #{html_escape(@issue.title)}"
 .left.width-65p
-  -#= simple_format html_escape(@issue.content)
   .issue_notes= render "notes/notes"
+
+  .loading{ :style => "display:none;"}
+    %center= image_tag "ajax-loader.gif"
 .right.width-30p
   .span-8
     - if @issue.closed
@@ -55,3 +57,12 @@
       .right= link_to 'Destroy', [@project, @issue], :confirm => 'Are you sure?', :method => :delete,  :class => "lbutton delete-issue negative", :id => "destroy_issue_#{@issue.id}"
 .clear
 
+:javascript
+  $(function(){
+    $("#note_note").live("click", function(){
+      $(this).css("height", "100px");
+      $('.attach_holder').show();
+    });
+
+    NoteList.init("wall", #{@notes.last.id}, #{@notes.first.id});
+  });
diff --git a/app/views/issues/show.js.haml b/app/views/issues/show.js.haml
index ae2ff32cc6c..ee31c0b8d3c 100644
--- a/app/views/issues/show.js.haml
+++ b/app/views/issues/show.js.haml
@@ -1,2 +1 @@
-:plain
-  $("#notes-list").html("#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"
diff --git a/app/views/notes/_load.js.haml b/app/views/notes/_load.js.haml
new file mode 100644
index 00000000000..f560f0bddc0
--- /dev/null
+++ b/app/views/notes/_load.js.haml
@@ -0,0 +1,10 @@
+- unless @notes.blank?
+
+  - if params[:last_id]
+    :plain
+      NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+
+  - if params[:first_id]
+    :plain
+      NoteList.append(#{@notes.last.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+
diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
index e33050b027e..4a5c3aab353 100644
--- a/app/views/notes/_notes.html.haml
+++ b/app/views/notes/_notes.html.haml
@@ -1,12 +1,8 @@
-- if controller.action_name == "wall"
-  %ul#notes-list= render "notes/notes_list"
-
-- else
-  %ul#notes-list= render "notes/notes_list"
-  %br
-  %br
-  - if can? current_user, :write_note, @project
-    = render "notes/form"
+- if can? current_user, :write_note, @project
+  = render "notes/form"
+.clear
+%hr
+%ul#notes-list= render "notes/notes_list"
 
 :javascript
   $('.delete-note').live('ajax:success', function() {
@@ -20,8 +16,11 @@
     $("#submit_note").removeAttr("disabled");
   })
 
--#- if ["issues", "projects"].include?(controller.controller_name)
-  :javascript
-    $(function(){
-      var int =self.setInterval("updatePage('ref=#{params[:ref]}')", 20000);
+  $(function(){
+    $("#note_note").live("click", function(){
+      $(this).css("height", "100px");
+      $('.attach_holder').show();
     });
+
+    NoteList.init("wall", #{@notes.last.try(:id) || 0}, #{@notes.first.try(:id) || 0});
+  });
diff --git a/app/views/notes/create.js.haml b/app/views/notes/create.js.haml
index ffc80140ecf..cf804493ca0 100644
--- a/app/views/notes/create.js.haml
+++ b/app/views/notes/create.js.haml
@@ -2,6 +2,7 @@
   :plain
     $("#new_note .errors").remove();
     $('#note_note').val("");
+    NoteList.prepend(#{@note.id}, "#{escape_javascript(render :partial => "notes/show", :locals => {:note => @note})}");
 - else
   :plain
     $("#new_note").replaceWith("#{escape_javascript(render('form'))}");
diff --git a/app/views/projects/wall.html.haml b/app/views/projects/wall.html.haml
index 2bc3150a1ed..4f0ec41ee92 100644
--- a/app/views/projects/wall.html.haml
+++ b/app/views/projects/wall.html.haml
@@ -1,19 +1,6 @@
 %div.wall_page
-  - if can? current_user, :write_note, @project
-    = render "notes/form"
-  .clear
-  %hr
-= render "notes/notes"
+  = render "notes/notes"
 
 .loading{ :style => "display:none;"}
   %center= image_tag "ajax-loader.gif"
 
-:javascript
-  $(function(){
-    $("#note_note").live("click", function(){
-      $(this).css("height", "100px");
-      $('.attach_holder').show();
-    });
-
-    NoteList.init("wall", #{@notes.last.id}, #{@notes.first.id});
-  });
diff --git a/app/views/projects/wall.js.haml b/app/views/projects/wall.js.haml
index 81417800c8d..ee31c0b8d3c 100644
--- a/app/views/projects/wall.js.haml
+++ b/app/views/projects/wall.js.haml
@@ -1,9 +1 @@
-- unless @notes.blank?
-
-  - if params[:last_id]
-    :plain
-      NoteList.prepend(#{@notes.first.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
-
-  - if params[:first_id]
-    :plain
-      NoteList.append(#{@notes.last.id}, "#{escape_javascript(render(:partial => 'notes/notes_list'))}");
+= render "notes/load"