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

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

diff --git a/app/assets/javascripts/controllers.js.coffee b/app/assets/javascripts/controllers.js.coffee
index 76c542f..c972325 100644 (file)
--- a/app/assets/javascripts/controllers.js.coffee
+++ b/app/assets/javascripts/controllers.js.coffee
@@ -4,9 +4,12 @@ class Pettanr.AppController
     _.extend(this, Backbone.Events)\r
   \r
   @new2: (params, form, operators, gate) ->\r
-    c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller']\r
+    c = @controller_by_name(params['controller'])\r
     new c(params, form, operators, gate)\r
   \r
+  @controller_by_name: (name) ->\r
+    Pettanr[Pettanr.camelize(name) + 'Controller']\r
+  \r
   set_model: () ->\r
     @my_controller = Manifest.manifest().controllers[@params['controller']]\r
     @my_action = @my_controller.actions[@params['action']]\r
@@ -39,17 +42,14 @@ class Pettanr.AppController
     @set_list()\r
     @list.open(() =>\r
       pager = Locmare.ListGroupModule.LibModule.Pager.factory(@list.page_status, @params)\r
-      filer_class = if @params['format'] == 'pick'\r
-        Locmare.Picker\r
-      else\r
-        Locmare.Filer\r
-      filer = new filer_class({\r
+      filer = new Locmare.Filer({\r
         item_name: @list.item_name, \r
         items: @list.items(), \r
         pager: pager, \r
         operators: @operators\r
       })\r
       @listenTo(filer, 'navigate', @navigate)\r
+      filer.render()\r
       @trigger('ready', filer)\r
     )\r
     false\r