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

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

diff --git a/app/assets/javascripts/editor/panel_editor.js.coffee b/app/assets/javascripts/editor/panel_editor.js.coffee
index 97eb950..59e2ba2 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor.js.coffee
@@ -113,12 +113,12 @@ class Editor.PanelEditor.Dialog extends Backbone.View
     this.$el.append(view.el)\r
   \r
   getter_proxy: () ->\r
-    proxy = new Pettanr.Proxy({operators: @operators})\r
+    proxy = new Pettanr.PickerProxy({operators: @operators})\r
     @listenTo(proxy, 'ready', @ready)\r
     @listenTo(proxy, 'title', @title)\r
     @listenTo(proxy, 'title', @push_history)\r
     @listenTo(proxy, 'done', @done)\r
-    @listenTo(proxy, 'lock', @lock)\r
+    @listenTo(proxy, 'deny', @deny)\r
     proxy\r
   \r
   http_get: (url, form) ->\r
@@ -138,8 +138,8 @@ class Editor.PanelEditor.Dialog extends Backbone.View
   \r
   done: (params) ->\r
   \r
-  lock: (params) ->\r
-    console.log('_lock')\r
+  deny: (params, form, safe_url) ->\r
+    @getter_proxy().http_get(safe_url, params, form)\r
   \r
   push_history: (params, str = null) ->\r
     @history.push(params, str)\r