fix: fetch err

[pettanr/pettanr.git] / app / assets / javascripts / views / speech_balloons / element.js.coffee

diff --git a/app/assets/javascripts/views/speech_balloons/element.js.coffee b/app/assets/javascripts/views/speech_balloons/element.js.coffee
index 017942c..4e79625 100644 (file)
--- 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\r
     @root = options.root\r
     @spot = options.spot\r
-    @add_element()\r
-  \r
-  add_element: () ->\r
-    @add_balloon()\r
-    @add_speech()\r
-  \r
-  add_balloon: () ->\r
     @balloon = @element.get('balloon')\r
-    @set_style()\r
     klass = @balloon_class()\r
     @balloon_view = new klass({\r
       parent: this, \r
@@ -22,8 +14,6 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
       root: @root,\r
       spot: @spot\r
     })\r
-  \r
-  add_speech: () ->\r
     @speech = @element.get('speech')\r
     klass = @speech_class()\r
     @speech_view = new klass({\r
@@ -33,15 +23,16 @@ class Pettanr.Views.SpeechBalloon.Element extends Pettanr.View
       spot: @spot\r
     })\r
   \r
-  clear: () ->\r
-    this\r
-  \r
   render: () ->\r
     this.$el.html('')\r
-    this.$el.append(@balloon_view.clear().el)\r
+    @balloon.get_parent('system_picture', this, {\r
+      success: (system_picture) =>\r
+        @balloon_view.system_picture = system_picture\r
+        this.$el.append(@balloon_view.render().el)\r
+        @balloon_view.init_picture()\r
+    })\r
     this.$el.append(@speech_view.render().el)\r
     @set_style()\r
-    @balloon_view.render()\r
     this\r
   \r
   set_style: () ->\r
@@ -70,14 +61,14 @@ class Pettanr.Views.SpeechBalloon.Element.Edit extends Pettanr.Views.SpeechBallo
     @listenTo(@element, 'sort', @set_style)\r
     @listenTo(@element, 'active', @active)\r
     @listenTo(@element, 'inactive', @inactive)\r
-  \r
-  render: () ->\r
-    super()\r
     @listenTo(@balloon, 'input:r', @input_r)\r
     @listenTo(@balloon, 'input:x', @set_style)\r
     @listenTo(@balloon, 'input:y', @set_style)\r
     @listenTo(@balloon, 'input:width', @set_style)\r
     @listenTo(@balloon, 'input:height', @set_style)\r
+  \r
+  render: () ->\r
+    super()\r
     bln = @balloon\r
     this.$el.draggable {\r
       stop: (event, ui) ->\r