Skip to content

Commit

Permalink
Merge branch 'need-more-cars-in-the-map' into techcrunch
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Dahan committed Sep 12, 2011
2 parents e061916 + c9b110c commit a8fc47e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/public/scripts/lepidoptera.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ lepidoptera = ->
dom_resource = $("#resources > ##{resource_id}")

if not dom_resource[0]?
dom_resource = $("#resources").append("<li class='resource alive' id='#{resource_id}'><h1 class='car_icon_wrapper'><span class='car_icon'>Car Icon</span></h1><span class='car_name'></span><ul class='feeds'></ul></li>")
dom_resource = $("#resources").prepend("<li class='resource alive' id='#{resource_id}'><h1 class='car_icon_wrapper'><span class='car_icon'>Car Icon</span></h1><span class='car_name'></span><ul class='feeds'></ul></li>")

dom_resource.toggleClass 'alive', alive

Expand All @@ -63,7 +63,7 @@ lepidoptera = ->

# see if we have a marker on the map for this resource
for m in markers
marker = m if m.title is data.car_name
marker = m if m.title is data.resource_id

# if we don't, add it to the map. This may be better put in updatePresence
if not marker?
Expand All @@ -72,7 +72,7 @@ lepidoptera = ->
icon: "../images/icon-car-map-active.png"
map: mapGoogle
html: "<strong>#{data.car_name}</strong>"
title: data.car_name
title: data.resource_id
infowindow = new google.maps.InfoWindow

google.maps.event.addListener marker, 'click', () ->
Expand Down

0 comments on commit a8fc47e

Please sign in to comment.