From c7bb260b4c7d7b2d98ef1a1d363c0cb12953c333 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 9 May 2011 00:30:06 +0100 Subject: [PATCH] User an RJS template for the javascript response --- app/controllers/map_bugs_controller.rb | 4 ++-- app/views/map_bugs/get_bugs.js.erb | 7 ------- app/views/map_bugs/get_bugs.rjs | 6 ++++++ 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 app/views/map_bugs/get_bugs.js.erb create mode 100644 app/views/map_bugs/get_bugs.rjs diff --git a/app/controllers/map_bugs_controller.rb b/app/controllers/map_bugs_controller.rb index a3984347b..bd91c1281 100644 --- a/app/controllers/map_bugs_controller.rb +++ b/app/controllers/map_bugs_controller.rb @@ -42,7 +42,7 @@ class MapBugsController < ApplicationController @bugs = MapBug.find_by_area(@min_lat, @min_lon, @max_lat, @max_lon, :include => :comments, :order => "updated_at DESC", :limit => limit, :conditions => conditions) respond_to do |format| - format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"} + format.html {render :template => 'map_bugs/get_bugs.rjs', :content_type => "text/javascript"} format.rss {render :template => 'map_bugs/get_bugs.rss'} format.js format.xml {render :template => 'map_bugs/get_bugs.xml'} @@ -187,7 +187,7 @@ class MapBugsController < ApplicationController :conditions => conditions) @bugs = bugs2.uniq respond_to do |format| - format.html {render :template => 'map_bugs/get_bugs.js', :content_type => "text/javascript"} + format.html {render :template => 'map_bugs/get_bugs.rjs', :content_type => "text/javascript"} format.rss {render :template => 'map_bugs/get_bugs.rss'} format.js format.xml {render :template => 'map_bugs/get_bugs.xml'} diff --git a/app/views/map_bugs/get_bugs.js.erb b/app/views/map_bugs/get_bugs.js.erb deleted file mode 100644 index 5bc9aafda..000000000 --- a/app/views/map_bugs/get_bugs.js.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% if @bugs.empty? %> - -<% else %> - <% @bugs.each do |bug| %> -putAJAXMarker(<%= bug.id.to_s %> , <%= bug.lon.to_s %> , <%= bug.lat.to_s %> , '<%= escape_javascript(bug.flatten_comment("
")) %>', <%= (bug.status=="open"?"0":"1") %> ); - <% end %> -<% end %> \ No newline at end of file diff --git a/app/views/map_bugs/get_bugs.rjs b/app/views/map_bugs/get_bugs.rjs new file mode 100644 index 000000000..7268ded74 --- /dev/null +++ b/app/views/map_bugs/get_bugs.rjs @@ -0,0 +1,6 @@ +@bugs.each do |bug| + page.call "putAJAXMarker", + bug.id, bug.lon, bug.lat, + bug.flatten_comment("
"), + bug.status == "open" ? 0 : 1 +end -- 2.43.2