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

[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 2440390..de37cba 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
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @filer_list()\r
   \r
   root: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @set_model()\r
     @item = new Pettanr.Folder.Root()\r
     @item.fetch({cache: true}).done =>\r
@@ -14,7 +14,7 @@ class Pettanr.FoldersController extends Pettanr.AppController
   show_html_format: (format) -> \r
   \r
   children_html: () -> \r
-    @trigger('retitle', @params, @item.get('name'))\r
+    @trigger('title', @params, @item.get('name'))\r
     collection = new Pettanr.Folder.Children({id: @item.get('id')})\r
     collection.fetch({cache: true}).done =>\r
       filer = new Locmare.Filer({\r
@@ -23,7 +23,6 @@ class Pettanr.FoldersController extends Pettanr.AppController
         pager: null, \r
         operators: @operators\r
       })\r
-      @listenTo(filer, 'navigate', @navigate)\r
       @trigger('ready', filer)\r
   \r
   show: () ->\r
@@ -35,27 +34,31 @@ 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
-          vp = new Pettanr.ViewPicker({operators: @operators})\r
-          @listenTo(vp, 'ready', @refresh)\r
-          @listenTo(vp, 'retitle', @retitle)\r
-          vp.navigate(@item.remote_url())\r
+          proxy = new Pettanr.Proxy({operators: @operators})\r
+          @listenTo(proxy, 'ready', @refresh)\r
+          @listenTo(proxy, 'title', @title)\r
+          @listenTo(proxy, 'done', @done)\r
+          proxy.http_get(@item.remote_url())\r
         else\r
           @children_html()\r
   \r
   count: () ->\r
   \r
   new: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_new()\r
   \r
   edit: () ->\r
-    @trigger('retitle', @params)\r
+    @trigger('title', @params)\r
     @form_edit()\r
   \r
   # for remote folder\r
   refresh: (view) ->\r
     @trigger('ready', view)\r
   \r
-  retitle: (params, str = null) ->\r
-    @trigger('retitle', @params, str = null)\r
+  title: (params, str = null) ->\r
+    @trigger('title', @params, str = null)\r
+  \r
+  done: (url) ->\r
+    @trigger('done', url)\r
   \r