From: yasushiito <yas@pen-chan.jp>
Date: Thu, 13 Aug 2015 02:57:27 +0000 (+0900)
Subject: t#:
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=87dc80d4ea2b9b1cfb5273c403b50c001225a61a

t#:
---

diff --git a/app/assets/javascripts/controllers/panels.js.coffee b/app/assets/javascripts/controllers/panels.js.coffee
index 702ba508..e143e723 100644
--- a/app/assets/javascripts/controllers/panels.js.coffee
+++ b/app/assets/javascripts/controllers/panels.js.coffee
@@ -36,9 +36,9 @@ class Pettanr.PanelsController extends Pettanr.AppController
         @show_html()
   
   show_html: () -> 
-    @item = @item.with_elements() # retake panel for 'with_elements' mode
+    @item = @item.play() # retake panel for 'with_elements' mode
     @item.fetch({cache: false}).done =>
-      @item.attributes = @item.replaced_attributes()
+      @item.attributes = @item.decoded_attributes()
       @trigger('title', @params, @item.get('caption'))
       show = new Pettanr.Views.Panel.Show(@item, {
         spot: null
@@ -52,15 +52,27 @@ class Pettanr.PanelsController extends Pettanr.AppController
   new: () ->
     @trigger('title', @params)
     @set_new()
-    @item = @item.with_elements()
-    @render_form()
+    @item = @item.edit({
+      context: this, 
+      success: (@item) ->
+        @item.boosts 'post'
+        @render_form()
+    })
     @trigger('done', @params)
   
   edit: () ->
     @trigger('title', @params)
-    @set_edit({with_elements: true})
+    @set_edit()
     @trigger('done', @params)
   
+  render_edit: (item) ->
+    item.edit({
+      context: this, 
+      success: (@item) ->
+        @item.boosts 'post'
+        @render_form()
+    })
+  
   render_form: () ->
     @form = new Editor.PanelEditor({root_item: @item})
     @form.render()
diff --git a/app/assets/javascripts/editor/panel_editor/element.js.coffee b/app/assets/javascripts/editor/panel_editor/element.js.coffee
index fe392be6..a4129756 100644
--- a/app/assets/javascripts/editor/panel_editor/element.js.coffee
+++ b/app/assets/javascripts/editor/panel_editor/element.js.coffee
@@ -44,7 +44,6 @@ class Editor.EditorModule.DockModule.ElementBay extends Editor.EditorModule.Dock
     tab = @find_tab(element)
     tab.label.remove()
     tab.body.remove()
-    console.log @tabs.indexOf(tab)
     @tabs.splice(@tabs.indexOf(tab), 1)
     #@tabs = _.compact(@tabs)
     @unshift_z()
diff --git a/app/assets/javascripts/locmare/form.js.coffee b/app/assets/javascripts/locmare/form.js.coffee
index c12a9ca3..96830baa 100644
--- a/app/assets/javascripts/locmare/form.js.coffee
+++ b/app/assets/javascripts/locmare/form.js.coffee
@@ -23,7 +23,6 @@ class Locmare.FormBase extends Pettanr.View
     @on('change:field', @change)
   
   change: (field) ->
-    console.log(field.field_name)
   
   fold_extend_settings: (params) ->
     @item.my_class().fold_extend_settings params[@item.item_name()]
diff --git a/app/assets/javascripts/locmare/form/field.js.coffee b/app/assets/javascripts/locmare/form/field.js.coffee
index bb24fab6..9dbd00aa 100644
--- a/app/assets/javascripts/locmare/form/field.js.coffee
+++ b/app/assets/javascripts/locmare/form/field.js.coffee
@@ -23,7 +23,7 @@ class Locmare.FormModule.Field extends Pettanr.View
     this
   
   refresh: () ->
-    @tag.render()
+    @tag.refresh()
     @helpers.refresh()
   
   change: () ->
diff --git a/app/assets/javascripts/locmare/form/field/tag/file.js.coffee b/app/assets/javascripts/locmare/form/field/tag/file.js.coffee
index 30a15e9b..a954868a 100644
--- a/app/assets/javascripts/locmare/form/field/tag/file.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/file.js.coffee
@@ -9,6 +9,9 @@ class Locmare.FormModule.FieldModule.TagModule.FileTag extends Locmare.FormModul
     this.$el.attr(@attr())
     this
   
+  refresh: () ->
+    @render()
+  
   change: (event) ->
   
   type: () ->
diff --git a/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
index ab616851..46f7b0f9 100644
--- a/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/hidden.js.coffee
@@ -5,6 +5,9 @@ class Locmare.FormModule.FieldModule.TagModule.HiddenTag extends Locmare.FormMod
     this.$el.attr(@attr())
     this
   
+  refresh: () ->
+    @render()
+  
   val: () ->
     parseInt(super)  # humm... 
   
diff --git a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
index 4eab9074..ea944d85 100644
--- a/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/number.js.coffee
@@ -11,6 +11,9 @@ class Locmare.FormModule.FieldModule.TagModule.NumberTag extends Locmare.FormMod
     this.$el.attr(@attr())
     this
   
+  refresh: () ->
+    @render()
+  
   change: () ->
     @field.helpers.refresh()
     @field.trigger('change')
diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
index 96437e21..f7c43e84 100644
--- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee
@@ -4,24 +4,37 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod
     'change': 'change'
   }
   
+  initialize: (options) ->
+    super(options)
+    @option_tags = []
+  
   render: () ->
+    this.$el.html('')
+    this.$el.attr(@attr())
+    @option_tags = []
     @select_values((members) =>
       values = if @model_attribute_manifest().source.translate()
         Pettanr.AppHelper.t_select_items(members)
       else
         members
-      this.$el.html('')
-      this.$el.attr(@attr())
       _.each values, (member) =>
         selected = if @is_selected(member)
           ' selected'
         else
           ''
-        this.$el.append('<option value="' + member[1] + '"' + selected + '>' + member[0] + '</option>')
+        tag = '<option value="' + member[1] + '"' + selected + '>' + member[0] + '</option>'
+        @option_tags.push(tag)
+        this.$el.append(tag)
       @trigger('ready:select')
     )
     this
   
+  refresh: () ->
+    this.$el.html('')
+    this.$el.attr(@attr())
+    _.each @option_tags, (tag) =>
+      this.$el.append(tag)
+  
   val: () ->
     switch @model_attribute_manifest().type
       when 'number'
diff --git a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
index 8971e129..ac6ac783 100644
--- a/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/text.js.coffee
@@ -10,6 +10,9 @@ class Locmare.FormModule.FieldModule.TagModule.TextTag extends Locmare.FormModul
     this.$el.val(@value())
     this
   
+  refresh: () ->
+    @render()
+  
   change: () ->
     @field.trigger('change')
   
diff --git a/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee b/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee
index 8db5e164..155d08cc 100644
--- a/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee
+++ b/app/assets/javascripts/locmare/form/field/tag/text_area.js.coffee
@@ -10,6 +10,9 @@ class Locmare.FormModule.FieldModule.TagModule.TextAreaTag extends Locmare.FormM
     this.$el.val(@value())
     this
   
+  refresh: () ->
+    @render()
+  
   change: () ->
     @field.trigger('change')
   
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index dc06e178..97981186 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -24,8 +24,8 @@ $ ->
   loaded_manifest.init()
   loaded_local_manifest.init()
   
-  #window.onbeforeunload = (e)->
-  #  return('leave?')
+  window.onbeforeunload = (e)->
+    return('leave?')
   Backbone.history.start({silent: true, pushState: true, root: '/'})
   
   Pettanr.cache = new Pettanr.Cache({operators: new Pettanr.Operator({})})
diff --git a/app/assets/javascripts/models/panel.js.coffee b/app/assets/javascripts/models/panel.js.coffee
index 22102c56..fec66737 100644
--- a/app/assets/javascripts/models/panel.js.coffee
+++ b/app/assets/javascripts/models/panel.js.coffee
@@ -58,16 +58,30 @@ class Pettanr.Panel extends Peta.Root
   label: (shorten_length) ->
     @_label('caption', shorten_length)
   
+  play: () ->
+    new Pettanr.Panel.Play({id: @get('id')})
+  
+  edit: (options) ->
+    i = new Pettanr.Panel.Edit({id: @get('id')})
+    i.load(options)
+  
   initialize: (attr = {}, options = {}) ->
     super(attr, options)
     @set(attr)
   
-class Pettanr.Panel.WithElements extends Pettanr.Panel
+class Pettanr.Panel.Play extends Pettanr.Panel
   
   fetch: (options) ->
     @url = @default_url() + '?with_elements=true'
     super(options)
   
+class Pettanr.Panel.Edit extends Pettanr.Panel.Play
+  
+  load: (options) ->
+    @fetch().done =>
+      @attributes = @decoded_attributes()
+      @load_elements(options)
+  
   save: (attrs) ->
     @url = @default_url()
     method = if @isNew()
diff --git a/app/assets/javascripts/peta/element_nestable_content.js.coffee b/app/assets/javascripts/peta/element_nestable_content.js.coffee
index 2087526b..001e9252 100644
--- a/app/assets/javascripts/peta/element_nestable_content.js.coffee
+++ b/app/assets/javascripts/peta/element_nestable_content.js.coffee
@@ -13,53 +13,108 @@ class Peta.ElementNestableContent extends Peta.Content
     _.each @elements_items(), (item) =>
       item.boosts(level) if item
   
-  replaced_attributes: (options = {}) ->
+  dig_elements: () ->
+    items = []
+    @_dig_elements(items, @attributes)
+    items
+  
+  _dig_elements: (items, attributes) ->
+    _.each attributes, (attribute, name) =>
+      a = @my_class().my_manifest().associations
+      if a.has_many[name]
+        _.each attribute, (attr) =>
+          items.push(attr)
+          Array.prototype.push.apply(items, attr.dig_elements())
+      if a.has_one[name]
+        items.push(attribute)
+        Array.prototype.push.apply(items, attribute.dig_elements())
+  
+  load_elements: (options) ->
+    @_load_elements(@dig_elements(), options)
+  
+  _load_elements: (items, options) ->
+    if _.isEmpty(items)
+      options.success.call(options.context, this)
+      return
+    item = items.shift()
+    item.fetch().done =>
+      @_load_elements(items, options)
+  
+  decoded_attributes: () ->
     attributes = {}
     _.each @attributes, (attribute, name) =>
-      replaced = if _.isArray(attribute)
+      a = @my_class().my_manifest().associations
+      decoded = if a.has_many[name]
         # has many association
-        model = @my_class().my_manifest().associations.has_many[name].model()
+        model = a.has_many[name].model()
         _.map attribute, (attr) =>
+          child = @cache_child(model, attr)
+          child.attributes = child.decoded_attributes()
+          child
+      else if a.has_one[name]
+        # has one association
+        model = a.has_one[name].model()
+        child = @cache_child(model, attribute)
+        child.attributes = child.decoded_attributes()
+        child
+      else
+        attribute
+      attributes[name] = decoded
+    attributes
+  
+  replaced_attributes: (options = {}) ->
+    attributes = {}
+    _.each @attributes, (attribute, name) =>
+      console.log name
+      console.log attribute
+      a = @my_class().my_manifest().associations
+      replaced = if a.has_many[name]
+        # has many association
+        _.map attribute, (decoded) =>
           child = if options.hold
-            @replace_and_hold_element(model, attr)
+            @replace_and_hold_element(decoded)
           else
-            @replace_element(model, attr)
+            @replace_element(decoded)
+          console.log child
           child.attributes = child.replaced_attributes(options)
           child
-      else if _.isObject(attribute)
+      else if a.has_one[name]
         # has one association
-        model = @my_class().my_manifest().associations.has_one[name].model()
         child = if options.hold
-          @replace_and_hold_element(model, attribute)
+          @replace_and_hold_element(attribute)
         else
-          @replace_element(model, attribute)
+          @replace_element(attribute)
         child.attributes = child.replaced_attributes(options)
         child
       else
         attribute
+      console.log replaced
       attributes[name] = replaced
     attributes
   
-  replace_element: (model, attr) ->
-    empty_child = new model(attr)
-    cached_child = Pettanr.cache.restore(empty_child)
+  replace_element: (decoded_child) ->
+    cached_child = Pettanr.cache.restore(decoded_child)
     item = if cached_child
       cached_child
     else
-      Pettanr.cache.store(empty_child)
-    item.attributes = attr
+      model = decoded_child.my_class()
+      caching_item = new model()
+      Pettanr.cache.store(caching_item)
     item
   
-  replace_and_hold_element: (model, attr) ->
-    empty_child = new model(attr)
-    cached_child = Pettanr.cache.restore(empty_child)
-    item = if cached_child
-      cached_child
+  cache_child: (model, attr) ->
+    attr_without_element = {}
+    _.each attr, (a, n) ->
+      if !_.isObject(a) and !_.isArray(a)
+        attr_without_element[n] = a
+    decoded_child = new model(attr_without_element)
+    cached_child = Pettanr.cache.restore(decoded_child)
+    holden_item = if cached_child
+      cached_child.hold()
     else
-      Pettanr.cache.store(empty_child) 
-    holden = item.hold()
-    holden.attributes = attr
-    holden
+      Pettanr.cache.store(decoded_child).hold()
+    holden_item.attributes = attr
+    holden_item
   
   hold: () ->
     super()
@@ -74,27 +129,28 @@ class Peta.ElementNestableContent extends Peta.Content
   
   release_elements: () ->
     _.each @attributes, (elements, name) =>
-      if _.isArray(elements)
+      a = @my_class().my_manifest().associations
+      if a.has_many[name]
         # has many association
-        model = @my_class().my_manifest().associations.has_many[name].model()
+        model = @my_class().my_manifest().associations.model()
         _.each elements, (element) =>
           element.release()
-      else if _.isObject(elements)
+      else if a.has_one[name]
         # has one association
         elements.release()
   
   fix_elements: () ->
     return 
     _.each @attributes, (elements, name) =>
-      if _.isArray(elements)
+      a = @my_class().my_manifest().associations
+      if a.has_many[name]
         # has many association
-        model = @my_class().my_manifest().associations.has_many[name].model()
         _.each elements, (element) =>
           if @has('_destroy')
             element.release()  # destroy element by editor
           else
             element.fix()
-      else if _.isObject(elements)
+      else if a.has_one[name]
         # has one association
         if @has('_destroy')
           element.release()
diff --git a/app/assets/javascripts/pettanr/inspire.js.coffee b/app/assets/javascripts/pettanr/inspire.js.coffee
index ba208484..c40cd932 100644
--- a/app/assets/javascripts/pettanr/inspire.js.coffee
+++ b/app/assets/javascripts/pettanr/inspire.js.coffee
@@ -4,14 +4,16 @@ class Pettanr.Inspire
     _.extend(this, Backbone.Events)
   
   go: (context, options) -> 
-    @item = @item.with_elements() # retake panel for 'with_elements' mode
-    @item.fetch({cache: false}).done =>
-      @item.attributes = @item.replaced_attributes()
-      delete @item.attributes['id']
-      @item.overwrite({})
-      @set_root()
-      @set_elements()
-      @save(context, options)
+    @item.edit({
+      context: this, 
+      success: (@item) ->
+        @item.boosts 'post'
+        delete @item.attributes['id']
+        @item.overwrite({})
+        @set_root()
+        @set_elements()
+        @save(context, options)
+    })
   
   set_root: () ->
     @root_form = Locmare.Form.factory({
diff --git a/app/assets/javascripts/views/authors/show.js.coffee b/app/assets/javascripts/views/authors/show.js.coffee
index 09f3aa84..27fa31c0 100644
--- a/app/assets/javascripts/views/authors/show.js.coffee
+++ b/app/assets/javascripts/views/authors/show.js.coffee
@@ -42,9 +42,9 @@ class Pettanr.Views.Author.ShowModule.PanelsBody extends Pettanr.View
       success: (items) => 
         pager = Locmare.ListGroupModule.LibModule.Pager.factory(@list.page_status, params)
         _.each items, (panel) =>
-          panel = panel.with_elements() # retake panel for 'with_elements' mode
+          panel = panel.play() # retake panel for 'with_elements' mode
           panel.fetch({cache: false}).done =>
-            panel.attributes = panel.replaced_attributes()
+            panel.attributes = panel.decoded_attributes()
             body = new Pettanr.Views.Panel.Body({
               panel: panel,
               spot: null
diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index d14426a5..0faa2a54 100644
--- a/app/assets/javascripts/views/balloons/element.js.coffee
+++ b/app/assets/javascripts/views/balloons/element.js.coffee
@@ -8,16 +8,14 @@ class Pettanr.Views.Balloon.Element extends Pettanr.View
     @spot = options.spot
     @speech_balloon = options.parent
   
-  clear: () ->
-    this
-  
   render: () ->
     this.$el.html('')
     @element.get_parent('system_picture', this, {
       success: (@system_picture) =>
-        @set_style()
         @init_picture()
+        @set_style()
     })
+    this
   
   init_picture: () ->
   
@@ -36,9 +34,6 @@ class Pettanr.Views.Balloon.Element extends Pettanr.View
       'z-index': 1  # play case
     }
   
-  add_element: (element) ->
-    null
-  
 class Pettanr.Views.Balloon.Element.Edit extends Pettanr.Views.Balloon.Element
   
   initialize: (options) ->
@@ -94,9 +89,12 @@ class Pettanr.Views.Balloon.Element.Edit extends Pettanr.Views.Balloon.Element
     }
   
   input_r: () ->
-    @render()
-    resize_div = this.$el.parent()
-    resize_div.css('z-index', 1)
+    @element.get_parent('system_picture', this, {
+      success: (@system_picture) =>
+        @set_style()
+        #resize_div = this.$el.parent()
+        #resize_div.css('z-index', 1)
+    })
   
   resize: () ->
     resize_div = this.$el.parent()
diff --git a/app/assets/javascripts/views/balloons/form.js.coffee b/app/assets/javascripts/views/balloons/form.js.coffee
index 8a7b4530..a320890d 100644
--- a/app/assets/javascripts/views/balloons/form.js.coffee
+++ b/app/assets/javascripts/views/balloons/form.js.coffee
@@ -2,7 +2,8 @@ class Pettanr.Views.Balloon.Form extends Locmare.Form
   
   initialize: (options) ->
     super(options)
-    @listenTo(@item, 'input:r', @input_r)
+    if @fields['r']    # passing scenario tab's event
+      @listenTo(@item, 'input:r', @input_r)
   
   render: () ->
     s = Form.__super__.render
diff --git a/app/assets/javascripts/views/ground_colors/element.js.coffee b/app/assets/javascripts/views/ground_colors/element.js.coffee
index ec234a2c..54965aa7 100644
--- a/app/assets/javascripts/views/ground_colors/element.js.coffee
+++ b/app/assets/javascripts/views/ground_colors/element.js.coffee
@@ -6,10 +6,6 @@ class Pettanr.Views.GroundColor.Element extends Pettanr.View
     @element = options.element
     @root = options.root
     @spot = options.spot
-    @add_element()
-  
-  clear: () ->
-    this
   
   render: () ->
     @restyle()
@@ -21,9 +17,6 @@ class Pettanr.Views.GroundColor.Element extends Pettanr.View
     }
     this.$el.attr(attr)
   
-  add_element: () ->
-    null
-  
   div_offset: () ->
     if @element.get('xy')
       @element.get('xy')
diff --git a/app/assets/javascripts/views/ground_pictures/element.js.coffee b/app/assets/javascripts/views/ground_pictures/element.js.coffee
index 424d09a6..52911b50 100644
--- a/app/assets/javascripts/views/ground_pictures/element.js.coffee
+++ b/app/assets/javascripts/views/ground_pictures/element.js.coffee
@@ -6,18 +6,14 @@ class Pettanr.Views.GroundPicture.Element extends Pettanr.View
     @element = options.element
     @root = options.root
     @spot = options.spot
-    @add_element()
   
   init_picture: () ->
   
-  clear: () ->
-    this
-  
   render: () ->
     @element.get_parent('picture', this, {
       success: (@picture) =>
-        @restyle()
         @init_picture()
+        @restyle()
     })
     this
   
@@ -29,9 +25,6 @@ class Pettanr.Views.GroundPicture.Element extends Pettanr.View
     }
     this.$el.attr(attr)
   
-  add_element: () ->
-    null
-  
   style: (spot = null, opacity = 20) ->
     r = {
       position: 'absolute', 
@@ -56,6 +49,7 @@ class Pettanr.Views.GroundPicture.Element.Edit extends Pettanr.Views.GroundPictu
     super(options)
   
   init_picture: () ->
+    super()
     @listenTo(@root, 'resize', @restyle)
     @listenTo(@root, 'input:width', @restyle)
     @listenTo(@root, 'input:height', @restyle)
@@ -65,7 +59,6 @@ class Pettanr.Views.GroundPicture.Element.Edit extends Pettanr.Views.GroundPictu
     @listenTo(@element, 'active', @active)
     @listenTo(@element, 'inactive', @inactive)
     @listenTo(@element, 'sort', @restyle)
-    super()
   
   active: () ->
     @root.trigger('active')
diff --git a/app/assets/javascripts/views/panel_pictures/element.js.coffee b/app/assets/javascripts/views/panel_pictures/element.js.coffee
index 62c903c1..174b382a 100644
--- a/app/assets/javascripts/views/panel_pictures/element.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/element.js.coffee
@@ -7,9 +7,6 @@ class Pettanr.Views.PanelPicture.Element extends Pettanr.View
     @root = options.root
     @spot = options.spot
   
-  clear: () ->
-    this
-  
   render: () ->
     @element.get_parent('picture', this, {
       success: (@picture) =>
@@ -33,9 +30,6 @@ class Pettanr.Views.PanelPicture.Element extends Pettanr.View
     attr = {style: Pettanr.to_style(@style())}
     this.$el.attr(attr)
   
-  add_element: () ->
-    null
-  
   style: () ->
     {
       'top': Pettanr.to_s(@element.get('y')) + 'px',
@@ -59,9 +53,6 @@ class Pettanr.Views.PanelPicture.Element.Img extends Pettanr.View
     @picture = options.picture
     @spot = options.spot
   
-  clear: () ->
-    this
-  
   render: () ->
     this.$el.html('')
     @restyle()
@@ -87,14 +78,14 @@ class Pettanr.Views.PanelPicture.Element.Edit extends Pettanr.Views.PanelPicture
   
   initialize: (options) ->
     super(options)
+  
+  init_picture: (img) ->
+    super(img)
     @listenTo(@element, 'input:x', @restyle)
     @listenTo(@element, 'input:y', @restyle)
     @listenTo(@element, 'sort', @restyle)
     @listenTo(@element, 'active', @active)
     @listenTo(@element, 'inactive', @inactive)
-  
-  init_picture: (img) ->
-    super(img)
     wrapper = this
     this.$el.draggable {
       stop: (event, ui) ->
diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee
index 5c71fc3c..fd139381 100644
--- a/app/assets/javascripts/views/panel_pictures/show.js.coffee
+++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee
@@ -9,7 +9,7 @@ class Pettanr.Views.PanelPicture.Show extends Pettanr.View.Show
       success: (item) =>
         @panel = item.with_elements()
         @panel.fetch().done =>
-          @panel.attributes = @panel.replaced_attributes()
+          @panel.attributes = @panel.decoded_attributes()
           @authored_by = @panel.authored_by()
           @body = new Pettanr.Views.Panel.Body({
             panel: @panel,
diff --git a/app/assets/javascripts/views/panels/body.js.coffee b/app/assets/javascripts/views/panels/body.js.coffee
index 48f79b61..d7949bb4 100644
--- a/app/assets/javascripts/views/panels/body.js.coffee
+++ b/app/assets/javascripts/views/panels/body.js.coffee
@@ -39,8 +39,7 @@ class Pettanr.Views.Panel.Body extends Pettanr.View
     view = new c({element: element, root: @panel, spot: @spot})
     @views.splice(index, 0, view)
     if @is_visible()
-      this.$el.append(view.clear().el)
-      view.render()
+      this.$el.append(view.render().el)
     view
   
   remove_element: (element) ->
diff --git a/app/assets/javascripts/views/scrolls/play.js.coffee b/app/assets/javascripts/views/scrolls/play.js.coffee
index 250f348d..20b4f5d5 100644
--- a/app/assets/javascripts/views/scrolls/play.js.coffee
+++ b/app/assets/javascripts/views/scrolls/play.js.coffee
@@ -151,7 +151,7 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Pettanr.View
   
   render: () ->
     this.$el.html('')
-    @panel = @panel.with_elements() # retake panel for 'with_elements' mode
+    @panel = @panel.play() # retake panel for 'with_elements' mode
     @panel.fetch({cache: true}).done =>
       @panel.attributes = @panel.replaced_attributes()
       body = new Pettanr.Views.Scroll.PlayModule.PanelBody({
diff --git a/app/assets/javascripts/views/speech_balloons/element.js.coffee b/app/assets/javascripts/views/speech_balloons/element.js.coffee
index 017942ca..7e88784d 100644
--- a/app/assets/javascripts/views/speech_balloons/element.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/element.js.coffee
@@ -6,15 +6,7 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
     @element = options.element
     @root = options.root
     @spot = options.spot
-    @add_element()
-  
-  add_element: () ->
-    @add_balloon()
-    @add_speech()
-  
-  add_balloon: () ->
     @balloon = @element.get('balloon')
-    @set_style()
     klass = @balloon_class()
     @balloon_view = new klass({
       parent: this, 
@@ -22,8 +14,6 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
       root: @root,
       spot: @spot
     })
-  
-  add_speech: () ->
     @speech = @element.get('speech')
     klass = @speech_class()
     @speech_view = new klass({
@@ -33,15 +23,11 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
       spot: @spot
     })
   
-  clear: () ->
-    this
-  
   render: () ->
     this.$el.html('')
-    this.$el.append(@balloon_view.clear().el)
+    this.$el.append(@balloon_view.render().el)
     this.$el.append(@speech_view.render().el)
     @set_style()
-    @balloon_view.render()
     this
   
   set_style: () ->
@@ -70,14 +56,14 @@ class Pettanr.Views.SpeechBalloon.Element.Edit extends Pettanr.Views.SpeechBallo
     @listenTo(@element, 'sort', @set_style)
     @listenTo(@element, 'active', @active)
     @listenTo(@element, 'inactive', @inactive)
-  
-  render: () ->
-    super()
     @listenTo(@balloon, 'input:r', @input_r)
     @listenTo(@balloon, 'input:x', @set_style)
     @listenTo(@balloon, 'input:y', @set_style)
     @listenTo(@balloon, 'input:width', @set_style)
     @listenTo(@balloon, 'input:height', @set_style)
+  
+  render: () ->
+    super()
     bln = @balloon
     this.$el.draggable {
       stop: (event, ui) ->
diff --git a/app/assets/javascripts/views/speeches/element.js.coffee b/app/assets/javascripts/views/speeches/element.js.coffee
index 6993faf1..9c4cfd11 100644
--- a/app/assets/javascripts/views/speeches/element.js.coffee
+++ b/app/assets/javascripts/views/speeches/element.js.coffee
@@ -7,16 +7,12 @@ class Pettanr.Views.Speech.Element extends Pettanr.View
     @root = options.root
     @spot = options.spot
     @parent = options.parent
-    @listenTo(@parent, 'ready:balloon', @set_style)
     c = @inner_class()
     @inner = new c({
       element: @element,
       parent: this
     })
   
-  clear: () ->
-    @render()
-  
   render: () ->
     @set_style()
     this.$el.html(@inner.render().el)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 57214ee5..be0c1892 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -160,7 +160,6 @@ class ApplicationController < ActionController::Base
         :list => list.map{|i| i.attributes}
         # :list => @finder.to_json
       }
-      p res
       render json:  res.to_json
     }
   end