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

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

diff --git a/app/assets/javascripts/pettanr/proxy.js.coffee b/app/assets/javascripts/pettanr/proxy.js.coffee
index c78d767..2ef5195 100644 (file)
--- a/app/assets/javascripts/pettanr/proxy.js.coffee
+++ b/app/assets/javascripts/pettanr/proxy.js.coffee
@@ -8,8 +8,6 @@ class Pettanr.Proxy
   local_router: (parsed_callback) ->\r
     local_router = new Pettanr.LocalRouter({operators: @operators})\r
     @listenTo(local_router, 'go', parsed_callback)\r
-    @listenTo(local_router, 'deny', @deny)\r
-    @listenTo(local_router, 'cancel', @cancel)\r
     local_router\r
   \r
   http_get: (url, form) ->\r
@@ -17,10 +15,13 @@ class Pettanr.Proxy
   \r
   get: (params, form) ->\r
     return if !@test(params, form)\r
+    return if !@filter(params, form)\r
     controller = Pettanr.AppController.new2(params, form, @operators, @gate)\r
     @listenTo(controller, 'ready', @ready)\r
     @listenTo(controller, 'title', @title)\r
     @listenTo(controller, 'done', @done)\r
+    @listenTo(controller, 'other', @other)\r
+    @listenTo(controller, 'deny', @remote_folder_deny)\r
     @listenTo(controller, 'lock', @lock)\r
     @listenTo(controller, 'unlock', @unlock)\r
     action_name = params['action']\r
@@ -40,8 +41,16 @@ class Pettanr.Proxy
         # blocking\r
         # back button event\r
         Backbone.history.navigate('/' + @gate.url(), {trigger: false})\r
+        @trigger('cancel', params, form)\r
         false\r
   \r
+  filter: (params, form) ->\r
+    if safe_url = Pettanr.ActionFilter.test(params, @operators)\r
+      @trigger('deny', params, form, safe_url)\r
+      false\r
+    else\r
+      true\r
+  \r
   ready: (view) ->\r
     @trigger('ready', view)\r
   \r
@@ -51,6 +60,9 @@ class Pettanr.Proxy
   done: (params) ->\r
     @trigger('done', params)\r
   \r
+  other: (url) ->\r
+    @local_router(@get).navigate(url)\r
+  \r
   lock: (params, form) ->\r
     @trigger('lock', params, form)\r
   \r
@@ -60,8 +72,8 @@ class Pettanr.Proxy
   deny: (params, form, safe_url) ->\r
     @trigger('deny', params, form, safe_url)\r
   \r
-  cancel: () ->\r
-    @trigger('cancel')\r
+  remote_folder_deny: (params, form, safe_url) ->\r
+    @trigger('deny', params, form, safe_url)\r
   \r
   http_post: (url, form) ->\r
     @local_router(@post).navigate(url, form)\r
@@ -93,3 +105,16 @@ class Pettanr.Proxy
   sign_out: () ->\r
     @trigger('sign_out')\r
   \r
+class Pettanr.PickerProxy extends Pettanr.Proxy\r
+  \r
+  get: (params, form) ->\r
+    if @is_deny(params)\r
+      alert("editor can't open on pick window")\r
+    else\r
+      super(params, form)\r
+  \r
+  is_deny: (params) ->\r
+    c = Pettanr.AppController.controller_by_name(params['controller'])\r
+    return false if !c['is_deny_action_on_picker']\r
+    c.is_deny_action_on_picker(params)\r
+  \r