load messages/channels via ajax rather than inline

maccman · maccman · commit e97ea38417f7 · 2011-04-05T16:31:38.000+12:00
diff --git a/app/controllers/app_controller.rb b/app/controllers/app_controller.rb
@@ -1,9 +1,4 @@
 class AppController < ApplicationController
   before_filter :require_user
   layout false
-  
-  def index
-    @channels = Channel.all
-    @messages = Message.all
-  end
 end
diff --git a/app/controllers/channels_controller.rb b/app/controllers/channels_controller.rb
@@ -2,6 +2,11 @@ class ChannelsController < ApplicationController
   before_filter :require_user
   before_filter :find_channel, :only => [:update, :destroy]
   
+  def index
+    @channels = Channel.all
+    render :json => @channels
+  end
+  
   def create
     Channel.create!(params)
     head :ok
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
@@ -1,6 +1,11 @@
 class MessagesController < ApplicationController
   before_filter :require_user
   
+  def index
+    @messages = Message.all
+    render :json => @messages
+  end
+  
   def create
     message = Message.new(params)
     message.name = current_user
diff --git a/app/javascripts/application.js b/app/javascripts/application.js
@@ -46,6 +46,9 @@ window.App = Spine.Controller.create({
     this.manager.bind("change", this.proxy(function(current){
       if (current == this.searches) this.sidebar.deactivate();
     }));
+    
+    Message.fetch();
+    Channel.fetch();
   }
 }).inst();
 
diff --git a/app/javascripts/lib/spine.model.ajax.js b/app/javascripts/lib/spine.model.ajax.js
@@ -35,7 +35,7 @@ var ajaxSync = function(method, record){
     
   if (method == "read")
     params.success = function(data){
-      (record.populate || record.load)(data);
+      (record.refresh || record.load).call(record, data);
     };
 
   params.error = function(e){
diff --git a/app/views/app/index.html.erb b/app/views/app/index.html.erb
@@ -6,12 +6,6 @@
   <%= csrf_meta_tag %>
   <%= meta_tag "handle", current_user %>
   <%= javascript_include_tag :juggernaut, "application" %>
-  <script type="text/javascript" charset="utf-8">
-    jQuery(function($){
-      Message.refresh(<%=raw @messages.to_json %>);
-      Channel.refresh(<%=raw @channels.to_json %>);
-    });
-  </script>
 </head>
 <body>
   <header id="title">

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,9 @@ window.App = Spine.Controller.create({`
`46`	`46`	`this.manager.bind("change", this.proxy(function(current){`
`47`	`47`	`if (current == this.searches) this.sidebar.deactivate();`
`48`	`48`	`}));`
	`49`	`+`
	`50`	`+ Message.fetch();`
	`51`	`+ Channel.fetch();`
`49`	`52`	`}`
`50`	`53`	`}).inst();`
`51`	`54`