fix router and render

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

diff --git a/app/assets/javascripts/controllers/folders.js.coffee b/app/assets/javascripts/controllers/folders.js.coffee
index 5fa72b5..5edbea4 100644 (file)
--- a/app/assets/javascripts/controllers/folders.js.coffee
+++ b/app/assets/javascripts/controllers/folders.js.coffee
@@ -1,11 +1,11 @@
 class Pettanr.FoldersController extends Pettanr.AppController\r
   \r
   index: () ->\r
-    @redraw_title(@params)\r
+    @trigger('retitle', @params)\r
     @filer_list()\r
   \r
   root: () ->\r
-    @redraw_title(@params)\r
+    @trigger('retitle', @params)\r
     @set_model()\r
     @item = new Pettanr.Folder.Root()\r
     @item.fetch({cache: true}).done =>\r
@@ -14,16 +14,17 @@ class Pettanr.FoldersController extends Pettanr.AppController
   show_html_format: (format) -> \r
   \r
   children_html: () -> \r
-    @redraw_title(@params, @item.get('name'))\r
+    @trigger('retitle', @params, @item.get('name'))\r
     collection = new Pettanr.Folder.Children({id: @item.get('id')})\r
-    collection.fetch({cache: true}).done ->\r
-      f = new Locmare.Filer({\r
+    collection.fetch({cache: true}).done =>\r
+      filer = new Locmare.Filer({\r
         item_name: 'folder', \r
         items: collection.models, \r
         pager: null, \r
-        operators: window.operators\r
+        operators: @operators\r
       })\r
-      $("#pettanr").html(f.render().el)\r
+      @listenTo(filer, 'navigate', @navigate)\r
+      @trigger('ready', filer)\r
   \r
   show: () ->\r
     if @params['format'] == 'prof'\r
@@ -34,22 +35,36 @@ class Pettanr.FoldersController extends Pettanr.AppController
       @item = new Pettanr.FolderWatch({id: @params['id']})\r
       @item.fetch({cache: true}).done () =>\r
         if @item.is_remote()\r
-          c = @item.get('controller_name')\r
-          a = if Pettanr.is_blank(@item.get('action_name'))\r
+          # redirect to remote item list\r
+          params = {}\r
+          params['controller'] = @item.get('controller_name')\r
+          params['action'] = if Pettanr.is_blank(@item.get('action_name'))\r
             'index'\r
           else\r
             @item.get('action_name')\r
-          window.router['c_i'](c, a, '') # call action event in router for redirect\r
+          # self fire\r
+          c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller']\r
+          controller = new c(@operators)\r
+          controller.params = params\r
+          @listenTo(controller, 'ready', @refresh)\r
+          @listenTo(controller, 'retitle', @retitle)\r
+          controller[params['action']]()\r
         else\r
           @children_html()\r
   \r
+  refresh: (view) ->\r
+    @trigger('ready', view)\r
+  \r
+  retitle: (params, str = null) ->\r
+    @trigger('retitle', @params, str = null)\r
+  \r
   count: () ->\r
   \r
   new: () ->\r
-    @redraw_title(@params)\r
+    @trigger('retitle', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @redraw_title(@params)\r
+    @trigger('retitle', @params)\r
     @form_edit()\r
   \r