From 9597966043944f52ef5554ee67d9a8c90f53bbb3 Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Fri, 14 Aug 2015 16:43:41 +0900
Subject: [PATCH] fix:player

---
 app/assets/javascripts/peta/element_nestable_content.js.coffee |  1 -
 app/assets/javascripts/views/balloons/element.js.coffee        |  6 +-----
 app/assets/javascripts/views/scrolls/play.js.coffee            | 10 +++++-----
 app/assets/javascripts/views/speech_balloons/element.js.coffee |  7 ++++++-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/peta/element_nestable_content.js.coffee b/app/assets/javascripts/peta/element_nestable_content.js.coffee
index 001e9252..2e4c3925 100644
--- a/app/assets/javascripts/peta/element_nestable_content.js.coffee
+++ b/app/assets/javascripts/peta/element_nestable_content.js.coffee
@@ -132,7 +132,6 @@ class Peta.ElementNestableContent extends Peta.Content
       a = @my_class().my_manifest().associations
       if a.has_many[name]
         # has many association
-        model = @my_class().my_manifest().associations.model()
         _.each elements, (element) =>
           element.release()
       else if a.has_one[name]
diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index 0faa2a54..b55600fc 100644
--- a/app/assets/javascripts/views/balloons/element.js.coffee
+++ b/app/assets/javascripts/views/balloons/element.js.coffee
@@ -10,11 +10,7 @@ class Pettanr.Views.Balloon.Element extends Pettanr.View
   
   render: () ->
     this.$el.html('')
-    @element.get_parent('system_picture', this, {
-      success: (@system_picture) =>
-        @init_picture()
-        @set_style()
-    })
+    @set_style()
     this
   
   init_picture: () ->
diff --git a/app/assets/javascripts/views/scrolls/play.js.coffee b/app/assets/javascripts/views/scrolls/play.js.coffee
index 2eb032ab..85dcfcd6 100644
--- a/app/assets/javascripts/views/scrolls/play.js.coffee
+++ b/app/assets/javascripts/views/scrolls/play.js.coffee
@@ -59,13 +59,13 @@ class Pettanr.Views.Scroll.PlayModule.Footer extends Pettanr.View
       success: (@author) =>
         @panel_face_button = @panel.mini_face_button({
           context: this,
-          click_panel: () ->
+          click: () ->
             @trigger('click:panel')
         })
         @author_face_button = @author.mini_face_button({
           context: this,
-          click_author: () ->
-            @trigger('click:author')
+          click: () ->
+            @trigger('click:author', @author)
         })
         l1 = new Tag.H3({
           content: Pettanr.AppHelper.t_m('Panel')
@@ -221,8 +221,8 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Pettanr.View
   click_show: () ->
     @trigger('http_get', @panel.show_url())
   
-  click_author: () ->
-    @trigger('http_get', @panel.author().show_url())
+  click_author: (author) ->
+    @trigger('http_get', author.show_url())
   
   click_insert: () ->
     @trigger('click:insert', this)
diff --git a/app/assets/javascripts/views/speech_balloons/element.js.coffee b/app/assets/javascripts/views/speech_balloons/element.js.coffee
index 7e88784d..4e79625b 100644
--- a/app/assets/javascripts/views/speech_balloons/element.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/element.js.coffee
@@ -25,7 +25,12 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
   
   render: () ->
     this.$el.html('')
-    this.$el.append(@balloon_view.render().el)
+    @balloon.get_parent('system_picture', this, {
+      success: (system_picture) =>
+        @balloon_view.system_picture = system_picture
+        this.$el.append(@balloon_view.render().el)
+        @balloon_view.init_picture()
+    })
     this.$el.append(@speech_view.render().el)
     @set_style()
     this
-- 
2.11.0