change editor

[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 671dfbc..f2a3869 100644 (file)
--- a/app/assets/javascripts/views/speech_balloons/element.js.coffee
+++ b/app/assets/javascripts/views/speech_balloons/element.js.coffee
@@ -6,20 +6,14 @@ class Pettanr.Views.SpeechBalloon.Element extends Backbone.View
     @element = options.element\r
     @root = options.root\r
     @spot = options.spot\r
+    @add_element()\r
   \r
-  add_element: (element) ->\r
-    switch element.item_name()\r
-      when 'balloon'\r
-        @balloon = element\r
-        @add_balloon()\r
-        view = @balloon_view\r
-      when 'speech'\r
-        @speech = element\r
-        @add_speech()\r
-        view = @speech_view\r
-    view\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
@@ -28,9 +22,9 @@ class Pettanr.Views.SpeechBalloon.Element extends Backbone.View
       root: @root,\r
       spot: @spot\r
     })\r
-    @balloon_view\r
   \r
   add_speech: () ->\r
+    @speech = @element.get('speech')\r
     klass = @speech_class()\r
     @speech_view = new klass({\r
       parent: this, \r
@@ -38,11 +32,8 @@ class Pettanr.Views.SpeechBalloon.Element extends Backbone.View
       root: @root,\r
       spot: @spot\r
     })\r
-    @speech_view\r
   \r
   render: () ->\r
-    @add_element(@element.get('balloon'))\r
-    @add_element(@element.get('speech'))\r
     this.$el.html('')\r
     this.$el.append(@balloon_view.clear().el)\r
     this.$el.append(@speech_view.render().el)\r
@@ -76,15 +67,7 @@ class Pettanr.Views.SpeechBalloon.Element.Edit extends Pettanr.Views.SpeechBallo
     @listenTo(@element, 'inactive', @inactive)\r
   \r
   render: () ->\r
-    this.$el.html('')\r
-    this\r
-  \r
-  set_style: () ->\r
-    super()\r
-  \r
-  add_balloon: () ->\r
     super()\r
-    this.$el.append(@balloon_view.clear().el)\r
     @listenTo(@balloon, 'input:r', @input_r)\r
     @listenTo(@balloon, 'input:x', @set_style)\r
     @listenTo(@balloon, 'input:y', @set_style)\r
@@ -98,10 +81,10 @@ class Pettanr.Views.SpeechBalloon.Element.Edit extends Pettanr.Views.SpeechBallo
         bln.set({x: left, y: top}, {silent: true})\r
         bln.trigger('move')\r
     }\r
+    this\r
   \r
-  add_speech: () ->\r
+  set_style: () ->\r
     super()\r
-    this.$el.append(@speech_view.render().el)\r
   \r
   # listen from speech\r
   input_r: () ->\r