Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/assets/javascripts/controllers/ground_colors.js.coffee b/app/assets/javascripts/controllers/ground_colors.js.coffee
index 4fc6fe9..373ed3f 100644 (file)
--- a/app/assets/javascripts/controllers/ground_colors.js.coffee
+++ b/app/assets/javascripts/controllers/ground_colors.js.coffee
@@ -15,24 +15,25 @@ class Pettanr.GroundColorsController extends Pettanr.AppController
     @filer_list()\r
     @trigger('done', @params)\r
   \r
-  show_html: () -> \r
-    @item.fetch({cache: true}).done =>\r
-      @trigger('title', @params, @item.get('caption'))\r
-      show = new Pettanr.Views.GroundColor.Show({\r
-        item: @item,\r
-        operators: @operators\r
-      })\r
-      # show.render()\r
-      @trigger('ready', show)\r
-      @trigger('done', @params)\r
-  \r
   show: () ->\r
-    @set_show()\r
+    @set_show(@render_show)\r
+  \r
+  render_show: () -> \r
     switch @params['format']\r
       when 'prof'\r
         @show_prof()\r
       when 'html'\r
         @show_html()\r
   \r
+  show_html: () -> \r
+    @trigger('title', @params, @item.get('caption'))\r
+    show = new Pettanr.Views.GroundColor.Show({\r
+      item: @item,\r
+      operators: @operators\r
+    })\r
+    show.render()\r
+    @trigger('ready', show)\r
+    @trigger('done', @params)\r
+  \r
   count: () ->\r
   \r