This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Resolved merge conflict.

  • Loading branch information...
2 parents 4a1036d + 7de9580 commit ca70340e9d2f417113fe121520b51374290c0763 @iammerrick committed May 17, 2012
@@ -14,9 +14,9 @@ define [
'click .veto' : 'veto'
initialize: ->
- @model.on 'change:'+@model.vetoesKey, @render, this
+ @model.on 'change:#{@model.vetoesKey}', @render
- render: () ->
+ render: =>
@html PlaceItemView @model.toJSON()
this
@@ -29,21 +29,18 @@ define [
tagName: 'ul'
- initialize: () ->
+ initialize: ->
@collection = new PlacesCollection
@collection.on 'reset', @render, this
@collection.fetch()
- render: () ->
+ render: ->
@append '<h2>What are my options?</h2>'
- @collection.each (place) ->
- @append new PlaceItemController(
- model: place
- ).render()
- , this
+ @collection.each (place) =>
+ @append new PlaceItemController(model: place).render()
this
- findLocation: () ->
- throw "No collection!" if ! @collection
+ findLocation: ->
+ throw "No collection!" unless @collection
@collection.select()

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

0 comments on commit ca70340

Please sign in to comment.