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 cf0d813..59e2ba2 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor.js.coffee
@@ -19,34 +19,26 @@ class Editor.PanelEditor extends Backbone.View
     \r
     @body.on('panel:resize', @panel_resize)\r
     @listenTo(@dock, 'http_post', @http_post)\r
+    @listenTo(@dock, 'add:element', @add_element)\r
     @listenTo(@dock, 'add:credit', @add_credit)\r
   \r
+  add_element: (element) ->\r
+    @body.add_element(element)\r
+  \r
   add_credit: (element) ->\r
     @credits.add_picture(element.picture())\r
   \r
-  add_element: (element) ->\r
-    panel_element_view = @body.add_element(element)\r
-    element_tab_form = @dock.add_element_to_element_tab(element)\r
-    scenario_tab_form = @dock.add_element_to_scenario_tab(element)\r
-    @dig(element, panel_element_view, element_tab_form, scenario_tab_form)\r
-    if element.constructor.has_picture()\r
-      @credits.add_picture(element.picture())\r
-  \r
-  dig: (element, panel_element_view, element_tab_form, scenario_tab_form) ->\r
-    _.each element.elements_items(), (child_element) =>\r
-      child_element.fetch({cache: true}).done =>\r
-        child_panel_element_view = panel_element_view.add_element(child_element)\r
-        child_element_tab_form = element_tab_form.add_element(child_element)\r
-        child_scenario_tab_form = scenario_tab_form.add_element(child_element)\r
-        @dig(child_element, child_panel_element_view, child_element_tab_form, child_scenario_tab_form)\r
-  \r
   remove_element: (element) ->\r
-    \r
+    @body.remove_element(element)\r
   \r
   render: () ->\r
     this.$el.html('')\r
     this.$el.append(@dialog.render().el)\r
-    @dialog.$el.dialog({autoOpen: false,      width: 640, height: 560    })\r
+    @dialog.$el.dialog({\r
+      autoOpen: false,\r
+      width: 750, \r
+      height: 560\r
+    })\r
     this.$el.append(@body.render().el)\r
     this.$el.append(@dock.render().el)\r
     this.$el.append(@credits.render().el)\r
@@ -98,29 +90,35 @@ class Editor.PanelEditor.Dialog extends Backbone.View
   initialize: (options) ->\r
     @parent = options.parent\r
     @operators = options.operators\r
+    @target_model = options.target_model\r
     @history = new Pettanr.Views.History({parent: this})\r
     @listenTo(@history, 'http_get', @http_get)\r
     @listenTo(@history, 'get', @get)\r
   \r
+  start: (@target_model, params, form) ->\r
+    @get(params, form)\r
+  \r
+  stop: () ->\r
+    @dialog().$el.dialog('close')\r
+  \r
   render: () ->\r
     this.$el.html('')\r
-    @history.render()\r
     this\r
   \r
   refresh: (view) ->\r
     this.$el.html('')\r
-    this.$el.append(@history.el)\r
+    this.$el.append(@history.render().el)\r
     rb = new Tag.RowBreak()\r
     this.$el.append(rb.render().el)\r
     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
@@ -132,13 +130,16 @@ class Editor.PanelEditor.Dialog extends Backbone.View
   ready: (view) ->\r
     @listenTo(view, 'http_get', @http_get)\r
     # @listenTo(view, 'http_post', @http_post)\r
+    @listenTo(view, 'pick', @pick)\r
+    if view['is_pickable'] and view.is_pickable()\r
+      view.add_pick(@target_model)\r
     @refresh(view)\r
+    this.$el.dialog('open')\r
   \r
   done: (params) ->\r
-    this.$el.dialog('open')\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
@@ -147,3 +148,6 @@ class Editor.PanelEditor.Dialog extends Backbone.View
     t = str || I18n.t(params['controller'] + '.' + params['action'] + '.title')\r
     this.$el.dialog({title: t})\r
   \r
+  pick: (item) ->\r
+    @trigger('pick', item)\r
+  \r