X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fcontrollers%2Fpanels.js.coffee;h=6d8819dc2b91c6a1b087c1e11236166f215b19b0;hp=ffea98400b5b8bf143f0fda7994375fa1c1923dc;hb=6d09b21c6587732677ca4369b2ceede4e5eeb9fa;hpb=d6d237012089604cdbc61943856d42c0a0472dc7

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
index ffea9840..6d8819dc 100644
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -3,22 +3,27 @@ class Pettanr.PanelsController extends Pettanr.AppController
   index: () ->
     @trigger('title', @params)
     @filer_list()
+    @trigger('done', @params)
   
   by_author: () ->
     @trigger('title', @params)
     @filer_list()
+    @trigger('done', @params)
   
   by_scroll: () ->
     @trigger('title', @params)
     @filer_list()
+    @trigger('done', @params)
   
   by_sheet: () ->
     @trigger('title', @params)
     @filer_list()
+    @trigger('done', @params)
   
   by_speech_balloon_template: () ->
     @trigger('title', @params)
     @filer_list()
+    @trigger('done', @params)
   
   show_html: () ->
     @item = new Pettanr.Panel.WithElements({id: @item.get('id')}) # retake panel for 'with_elements' mode
@@ -31,6 +36,7 @@ class Pettanr.PanelsController extends Pettanr.AppController
       })
       show.render()
       @trigger('ready', show)
+      @trigger('done', @params)
       false
   
   show: () ->
@@ -46,7 +52,9 @@ class Pettanr.PanelsController extends Pettanr.AppController
   new: () ->
     @trigger('title', @params)
     @set_new()
+    Pettanr.History.lock_url = @item.new_url()
     @editor()
+    @trigger('done', @params)
   
   edit: () ->
     @trigger('title', @params)
@@ -54,20 +62,25 @@ class Pettanr.PanelsController extends Pettanr.AppController
     panel = new Pettanr.Panel({id: @params['id']})
     @item = panel.with_elements()
     @item.fetch({cache: false}).done =>
-      editor = new Editor.PanelEditor({root_item: @item, operators: @operators})
-      #editor.render()
-      @trigger('ready', editor)
+      Pettanr.History.lock_url = @item.edit_url()
+      @editor()
+      @trigger('done', @params)
   
   editor: () ->
+    editor = new Editor.PanelEditor({root_item: @item, operators: @operators})
+    editor.render()
+    @trigger('ready', editor)
   
   create: () ->
-    @form.item.overwrite({operators: @operators})
+    # @form is editor
+    @form.panel.overwrite({operators: @operators})
     @listenTo(@form, 'success', @post_success)
     @listenTo(@form, 'fail', @post_fail)
     @form.save()
   
   update: () ->
-    @form.item.overwrite({operators: @operators})
+    # @form is editor
+    @form.panel.overwrite({operators: @operators})
     @listenTo(@form, 'success', @post_success)
     @listenTo(@form, 'fail', @post_fail)
     @form.save()