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 eaeba62..59e2ba2 100644 (file)
--- a/app/assets/javascripts/editor/panel_editor.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor.js.coffee
@@ -19,13 +19,17 @@ 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
   remove_element: (element) ->\r
-    \r
+    @body.remove_element(element)\r
   \r
   render: () ->\r
     this.$el.html('')\r
@@ -95,6 +99,7 @@ class Editor.PanelEditor.Dialog extends Backbone.View
     @get(params, form)\r
   \r
   stop: () ->\r
+    @dialog().$el.dialog('close')\r
   \r
   render: () ->\r
     this.$el.html('')\r
@@ -129,9 +134,9 @@ class Editor.PanelEditor.Dialog extends Backbone.View
     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
   deny: (params, form, safe_url) ->\r
     @getter_proxy().http_get(safe_url, params, form)\r