GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

kneath / greed fork watch download tarball
public
Description: A simple application written in merb to help you manage ad serving across multiple sites
Clone URL: git://github.com/kneath/greed.git 
Fix IE6 crash
kneath (author)
Wed Jun 04 21:31:40 -0700 2008
commit  f443edc797479639ed72be649b54487de76ec74b
tree    b14df8ae6872abe6e5529d9dc9233a98dc6f6ff5
parent  0c17333a7eb8f6aafc9ce042fc779a21a84139e3
0
app/controllers/server.rb 
...
4
5
6
7
 
8
9
10
 
...
4
5
6
 
7
8
9
10
 
0
@@ -4,7 +4,7 @@ class Server < Merb::Controller
0
   def spot
0
     @spot = Spot.find(params[:id])
0
     @campaign = @spot.campaign_for_serving
0
-    render_then_call(render(:layout => false)) do
0
+    render_then_call(render(:layout => false, :format => :js)) do
0
       geo_ip = GeoIP.new(Merb.root / "data" / "GeoLiteCity.dat")
0
       geo_ip_data = geo_ip.city(request.remote_ip)
0
       impression = @campaign.impressions.create(:ip => request.remote_ip, :country => geo_ip_data[5])
0
app/helpers/global_helpers.rb 
...
21
22
23
24
 
25
26
27
 
...
21
22
23
 
24
25
26
27
 
0
@@ -21,7 +21,7 @@ module Merb
0
     end
0
     
0
     def format_for_javascript(body)
0
-      body.gsub(/\'/, "&apos;").gsub(/\n/, "").gsub(/\r/, "")
0
+      body.gsub(/\'/, "&apos;").gsub(/\n/, "").gsub(/\r/, "").gsub(/\t/, "").gsub(/ +/, " ")
0
     end
0
     
0
     def destroy_button(url, text)

Comments

    No one has commented yet.