conflict

[pettanr/pettanr.git] / app / assets / javascripts / controllers / balloons.js.coffee

diff --git a/app/assets/javascripts/controllers/balloons.js.coffee b/app/assets/javascripts/controllers/balloons.js.coffee
index ffcc98b..38da1bb 100644 (file)
--- a/app/assets/javascripts/controllers/balloons.js.coffee
+++ b/app/assets/javascripts/controllers/balloons.js.coffee
@@ -18,7 +18,7 @@ class Pettanr.BalloonsController extends Pettanr.AppController
   show: () ->\r
     @set_show(@render_show)\r
   \r
-  render_show: () -> \r
+  render_show: (@item) -> \r
     switch @params['format']\r
       when 'prof'\r
         @show_prof()\r
@@ -27,9 +27,7 @@ class Pettanr.BalloonsController extends Pettanr.AppController
   \r
   show_html: () -> \r
     @trigger('title', @params)\r
-    show = new Pettanr.Views.Balloon.Show({\r
-      item: @item,\r
-      operators: @operators\r
+    show = new Pettanr.Views.Balloon.Show(@item, {\r
     })\r
     show.render()\r
     @trigger('ready', show)\r