add load icon

[pettanr/pettanr.git] / app / assets / javascripts / models / license.js.coffee

diff --git a/app/assets/javascripts/models/license.js.coffee b/app/assets/javascripts/models/license.js.coffee
index b1901bf..466b841 100644 (file)
--- a/app/assets/javascripts/models/license.js.coffee
+++ b/app/assets/javascripts/models/license.js.coffee
@@ -17,26 +17,19 @@ class Pettanr.License extends Peta.SystemResource
   system_picture: () ->\r
     new Pettanr.SystemPicture({id: @get('system_picture_id')})\r
   \r
-  symbol_option: (cb) ->\r
+  symbol_option: () ->\r
     i = @system_picture()\r
     i.fetch({cache: true}).done =>\r
-      cb(i.tmb_opt_img_tag())\r
+      @symbol_picture = i.tmb_opt_img_tag()\r
+      @trigger('ready:symbol')\r
   \r
   caption_with_group: () ->\r
-    new Pettanr.License.Caption({license: this, license_group: @license_group()})\r
+    i = @license_group()\r
+    i.fetch({cache: true}).done =>\r
+      @caption_text = i.get('caption') + '/' + @get('caption')\r
+      @trigger('ready:caption')\r
   \r
   initialize: () ->\r
     if @id\r
       @url = @url + @id\r
   \r
-class Pettanr.License.Caption extends Backbone.View\r
-  tagName: 'span'\r
-  initialize: (options) ->\r
-    @license = options.license\r
-    @license_group = options.license_group\r
-    \r
-  render: () ->\r
-    @license_group.fetch({cache: true}).done =>\r
-      this.$el.html(@license_group.get('caption') + '/' + @license.get('caption'))\r
-    this\r
-  \r