0
@@ -3,7 +3,7 @@
0
   def index
0
       @date = Time.parse("#{params[:date]} || TzTime.now")
0
       @avatars = Avatar.find(:all, :limit => 3, :include => :user, :order => 'avatars.updated_at desc')
0
-      @message = Message.latest
0
+      @message = Message.last
0
       @chatters = User.chatting
0
       @events = Event.find(:all, :conditions => ['date between ? and ?', @date.strftime("%Y-%m") + '-01', @date.next_month.strftime("%Y-%m") + '-01'])
0
       @headers = Header.find(:all, :limit => 3, :include => :user, :order => 'headers.created_at desc')

0
@@ -4,13 +4,16 @@
0
   before_filter :require_login, :only => [:create]
0
   before_filter :can_edit, :only => [:destroy]
0
   
0
-  skip_filter :update_online_at, :get_layout_vars, :only => [:refresh_messages, :refresh_chatters]
0
+  skip_filter :update_online_at, :get_layout_vars, :only => [:more, :refresh, :refresh_chatters]
0
   
0
   def index
0
+    @messages = Message.get(params[:limit])
0
+    unless @messages.empty?
0
+      session[:message_id] = @messages.map(&:id).max
0
+      @last_message = @messages.map(&:id).min
0
+    end
0
     current_user.update_attribute('chatting_at', Time.now.utc) if logged_in?
0
     @chatters = User.chatting
0
-    @messages = Message.paginate(:page => params[:page], :include => [:user], :order => 'messages.created_at desc')
0
-    session[:message_id] = @messages.map(&:id).max unless @messages.empty?
0
   end
0
   
0
   def show
0
@@ -34,7 +37,17 @@
0
     redirect_to chat_url
0
   end
0
   
0
-  def refresh_messages
0
+  def more
0
+    @messages = Message.more(params[:id])
0
+    @last_message = @messages.map(&:id).min unless @messages.empty?
0
+    render :update do |page|
0
+      page.insert_html :bottom, 'messages-index', :partial => 'messages', :object => @messages
0
+      page.replace_html 'messages-more', :partial => 'more', :object => @last_message
0
+      page.replace_html 'messages-more', :partial => 'more_disabled' if @messages.empty?
0
+    end
0
+  end
0
+  
0
+  def refresh
0
     @messages = Message.refresh(session[:message_id], current_user)
0
     session[:message_id] = @messages.map(&:id).max unless @messages.empty?
0
     if @messages
0
@@ -53,6 +66,6 @@
0
         page.replace_html 'chatters', :partial => 'chatters', :object => @chatters
0
       end
0
     end
0
-  end
0
+  end  
0
 end

0
@@ -15,12 +15,21 @@
0
   
0
   validates_presence_of :body
0
   
0
-  def self.latest
0
-    find(:first, :order => 'created_at desc')
0
+  # TODO can remove w/ rails 2.1
0
+  def self.last
0
+    find(:first, :order => 'id desc')
0
   end
0
   
0
-  def self.refresh(message_id, current_user)
0
-    find(:all, :order => 'created_at desc', :conditions => ['id > ? and user_id != ?', message_id, current_user])
0
+  def self.more(id)
0
+    find(:all, :limit => 50, :order => 'messages.id desc', :include => :user, :conditions => ['messages.id < ?', id])
0
+  end
0
+  
0
+  def self.get(limit)
0
+    find(:all, :limit => limit || 50, :order => 'messages.id desc', :include => :user)
0
+  end
0
+  
0
+  def self.refresh(id, current_user)
0
+    find(:all, :order => 'messages.id desc', :include => :user, :conditions => ['messages.id > ? and user_id != ?', id, current_user])
0
   end
0
   
0
   def to_s

0
@@ -1 +1,2 @@
0
+<%= link_to_remote '&darr; More Messages &darr;', :url => { :action => 'more', :id => @last_message }, :method => :get %>

0
@@ -1 +1,2 @@
0
+<span class="disabled">No More Messages</span>

0
@@ -22,9 +22,11 @@
0
   </tbody>
0
 </table>
0
 
0
-<% unless params[:page] %>
0
-  <%= periodically_call_remote :url => refresh_messages_path, :method => 'get', :frequency => 3 %>
0
-  <%= periodically_call_remote :url => refresh_chatters_path, :method => 'get', :frequency => 10 %>
0
-  <%= javascript_tag "$('message_body').focus();$('message_body').writeAttribute('autocomplete', 'off');" if logged_in? %>
0
-<% end %>
0
+<p id="messages-more" class="center">
0
+  <%= render :partial => 'more', :object => @last_message %>
0
+</p>
0
+
0
+<%= periodically_call_remote :url => refresh_messages_path, :method => 'get', :frequency => 3 %>
0
+<%= periodically_call_remote :url => refresh_chatters_path, :method => 'get', :frequency => 10 %>
0
+<%= javascript_tag "$('message_body').focus();$('message_body').writeAttribute('autocomplete', 'off');" if logged_in? %>

0
@@ -115,12 +115,6 @@
0
   </div>
0
 <% end %>
0
 
0
-<% if current_controller == 'messages' and current_action == 'index' %>
0
-  <div class="info-right">
0
-    <%= will_paginate @messages, :inner_window => 1, :outer_window => 0, :prev_label => '&laquo; Prev' %>
0
-  </div>
0
-<% end %>
0
-
0
 <% if current_controller == 'posts' and current_action == 'edit' %>
0
   <div class="info-left">
0
     <%= link_to 'Home', root_path %> &raquo; 

0
@@ -7,7 +7,7 @@
0
   map.resources :events
0
   map.resources :forums, :member => { :confirm_delete => :get }
0
   map.resources :headers, :member => { :vote_up => :post, :vote_down => :post }
0
-  map.resources :messages
0
+  map.resources :messages, :collection => { :more => :get, :refresh => :get }
0
   map.resources :posts, :member => { :quote => :get, :topic => :get }
0
   map.resources :ranks
0
   map.resources :settings
0
@@ -18,7 +18,6 @@
0
   map.resources :users, :member => { :posts => :get, :confirm_delete => :get, :admin => :post, :ban => :get, :remove_ban => :post }
0
   
0
   map.search 'search', :controller => 'search', :action => 'index'
0
-  map.refresh_messages 'refresh_messages', :controller => 'messages', :action => 'refresh_messages'
0
   map.refresh_chatters 'refresh_chatters', :controller => 'messages', :action => 'refresh_chatters'
0
   
0
   map.login 'login', :controller => 'users', :action => 'login'

0
@@ -589,6 +589,10 @@
0
   padding: 4px 5px;
0
 }
0
 
0
+.center {
0
+	text-align: center;
0
+}
0
+
0
 .post-body img { max-width: 560px; }
0
 .post-body blockquote img { max-width: 528px; }
0
 .post-body blockquote blockquote img { max-width: 494px; }

0
@@ -99,8 +99,13 @@
0
     assert_redirected_to root_path
0
   end
0
   
0
+  def test_more_messages_path_should_work
0
+    get :more
0
+    assert_response :success
0
+  end
0
+  
0
   def test_refresh_messages_path_should_work
0
-    get :refresh_messages
0
+    get :refresh
0
     assert_response :success
0
   end
0
   
0
@@ -108,6 +113,6 @@
0
     get :refresh_chatters
0
     assert_response :success
0
   end
0
-
0
+  
0
 end