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

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

diff --git a/app/assets/javascripts/controllers/comics.js.coffee b/app/assets/javascripts/controllers/comics.js.coffee
index 3d1ffc2..6d604e8 100644 (file)
--- a/app/assets/javascripts/controllers/comics.js.coffee
+++ b/app/assets/javascripts/controllers/comics.js.coffee
@@ -3,24 +3,28 @@ class Pettanr.ComicsController extends Pettanr.AppController
   index: () ->\r
     @trigger('title', @params)\r
     @filer_list()\r
+    @trigger('done', @params)\r
   \r
   by_author: () ->\r
     @trigger('title', @params)\r
     @filer_list()\r
+    @trigger('done', @params)\r
   \r
   by_story: () ->\r
     @trigger('title', @params)\r
     @filer_list()\r
+    @trigger('done', @params)\r
   \r
   show_html: () -> \r
-    @item.fetch({cache: true}).done =>\r
-      @trigger('title', @params, @item.get('title'))\r
-      show = new Pettanr.Views.Comic.Show({\r
-        item: @item,\r
-        operators: @operators\r
-      })\r
-      show.render()\r
-      @trigger('ready', show)\r
+    Pettanr.cache.restore(@item)\r
+    @trigger('title', @params, @item.get('title'))\r
+    show = new Pettanr.Views.Comic.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
@@ -34,11 +38,13 @@ class Pettanr.ComicsController extends Pettanr.AppController
   \r
   new: () ->\r
     @trigger('title', @params)\r
-    @form_new(@create)\r
+    @form_new()\r
+    @trigger('done', @params)\r
   \r
   edit: () ->\r
     @trigger('title', @params)\r
-    @form_edit(@update)\r
+    @form_edit()\r
+    @trigger('done', @params)\r
   \r
   create: () ->\r
     @form.item.overwrite({operators: @operators})\r