X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fassets%2Fjavascripts%2Fviews%2Fballoons%2Felement.js.coffee;h=bec504e6c6d6bf72964804f4a90662016db1f799;hb=refs%2Fheads%2Fv06;hp=f01d3d956769e5aec980685d06cc86d75dc5336d;hpb=c2b954f7004cb2bf4a8ea3b5fbc003f3306f45d8;p=pettanr%2Fpettanr.git

diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index f01d3d95..bec504e6 100644
--- a/app/assets/javascripts/views/balloons/element.js.coffee
+++ b/app/assets/javascripts/views/balloons/element.js.coffee
@@ -8,22 +8,17 @@ class Pettanr.Views.Balloon.Element extends Pettanr.View
     @spot = options.spot
     @speech_balloon = options.parent
   
-  clear: () ->
-    this
-  
   render: () ->
     this.$el.html('')
-    retriever = @element.system_picture()
-    @listenTo(retriever, 'retrieve', @retrieve_system_picture)
-    retriever.retrieve()
-  
-  retrieve_system_picture: (@system_picture) ->
     @set_style()
+    this
+  
+  init_picture: () ->
   
   set_style: () ->
     attr = {
-      src: @system_picture.r_url(), 
-      alt: @element.get('caption'),
+      src: @system_picture.picture_file().src(), 
+      alt: @speech_balloon.element.get('caption'),
       style: Pettanr.to_style(@style())
     }
     this.$el.attr(attr)
@@ -35,19 +30,15 @@ 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) ->
     super(options)
+  
+  init_picture: () ->
     @listenTo(@element, 'input:system_picture_id', @input_r)
     @listenTo(@element, 'input:width', @resize)
     @listenTo(@element, 'input:height', @resize)
-  
-  retrieve_system_picture: (@system_picture) ->
-    super(@system_picture)
     sb = @speech_balloon
     elm = @element
     this.$el.resizable {
@@ -94,9 +85,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()