merge:

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

diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee
index df7d50d..544c250 100644 (file)
--- a/app/assets/javascripts/pettanr.js.coffee
+++ b/app/assets/javascripts/pettanr.js.coffee
@@ -62,19 +62,21 @@ class Pettanr
     a.join('; ')\r
   \r
   @url: (controller_name, action_name, params) ->\r
-    controller = Manifest.manifest().controllers[controller_name]\r
-    action = controller.actions[action_name]\r
-    action.url(params)\r
+    if controller = Manifest.manifest().controllers[controller_name]\r
+      # convert from manifest\r
+      action = controller.actions[action_name]\r
+      action.url(params)\r
+    else\r
+      # has no manifest\r
+      controller_name + '/' + action_name\r
   \r
   @params_to_url: (params) ->\r
+    return '' if params['controller'] == 'folders' and params['action'] == 'root'\r
     @url(params['controller'], params['action'], params)\r
   \r
   @is_sns: () ->\r
     Manifest.manifest().magic_numbers.run_mode != 0\r
   \r
-  @before_filter: (action_name, filter_action_names) ->\r
-    _.contains(filter_action_names, action_name)\r
-  \r
   class Pettanr.AppHelper\r
     @manifest: () ->\r
       Manifest.manifest\r
@@ -108,35 +110,9 @@ class Pettanr
       else\r
         $.timeago(datetime)\r
     \r
-    \r
-  @cache = {}\r
-  @credits = {}\r
   \r
-  class Pettanr.Dialog extends Backbone.View\r
-    \r
-    initialize: (options) ->\r
-      super(options)\r
-    \r
-    render: () ->\r
-      this.$el.html('')\r
-      this\r
-    \r
-    refresh: (body) ->\r
-      @listenTo(body, 'navigate', @navigate)\r
-      this.$el.html(body.render().el)\r
-    \r
-    fire: (params) ->\r
-      c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller']\r
-      controller = new c\r
-      controller.params = params\r
-      @listenTo(controller, 'ready', @refresh)\r
-      # ignore retitle message\r
-      # @listenTo(controller, 'retitle', @retitle)\r
-      controller[params['action']]()\r
-    \r
-    local_navigate: (url) ->\r
-      @router.local_navigate(url, true)\r
-    \r
+  @cache = null  # set by main\r
+  @credits = {}\r
   \r
   #>> https://gist.github.com/davidjbeveridge/3813724\r
   @xeach: (arr, func, index=0) ->\r