From: yasushiito <yas@pen-chan.jp>
Date: Sat, 23 Aug 2014 07:47:19 +0000 (+0900)
Subject: Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=b404a6f66817a05b366a452fdf5eda4f9ac9c50f;hp=097ff1b6ec0787d4af50acd1e4dcd1402b4694ee

Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
---

diff --git a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
index 0e0218c2..07f20414 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body.js.coffee
@@ -3,11 +3,14 @@ class Locmare.FilerModule.BodyModule.FileBody extends Backbone.View
   
   initialize: (options) ->
     @body = options.body
-    @items = @filer().items
+    @collection = @filer().list_result
+    _this = this
+    @collection.fetch().done ->
+      _this.render()
   
   render: () ->
     _this = this
-    _.each @items, (item) ->
+    _.each @collection.models, (item) ->
       c = _this.file_item_class()
       file_item = new c({'file_body': _this, 'item': item})
       _this.$el.append(file_item.render().el)
diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
index 8aad184d..109a0c06 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default.js.coffee
@@ -9,7 +9,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
     @link = m.LinkFactory.factory this, @my_manifest.link, @item
   
   render: () ->
-    this.$el.html(@renderer().render().el)
+    this.$el.html(@face.render().el)
     this
   
   show: () ->
diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/image.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/image.js.coffee
index b7a20d19..018382cf 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/image.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/image.js.coffee
@@ -2,15 +2,13 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
   
   initialize: (options) ->
     super(options)
+    @picture = new Pettanr.AppHelperImg({src: @url(), size: @icon_size()})
   
   render: () ->
-    i = new Pettanr.AppHelperImg({src: @url(), size: @icon_size()})
-    this.$el.html(i.render().el)
+    if @picture
+      this.$el.html(@picture.render().el)
     this
   
   url: () ->
     @my_manifest.url
   
-  tag_opt: () ->
-    {'src': @url(), 'width': Manifest.manifest().magic_numbers['thumbnail_width'], 'height': Manifest.manifest().magic_numbers['thumbnail_height']}
-  
diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
index ed955d43..11f6397b 100644
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/picture.js.coffee
@@ -2,24 +2,20 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol
   
   initialize: (options) ->
     super(options)
+    _this = this
+    if i = @item[@method_name()]()
+      i.fetch().done ->
+        _this.picture = new Pettanr.AppHelperImg({src: i.r_url(), size: _this.icon_size()})
+        _this.render()
+    else
+      @picture = new Pettanr.AppHelperImg({src: '/images/error.png', size: @icon_size()})
+      _this.render()
   
   render: () ->
-    i = new Pettanr.AppHelperImg({src: @url(), size: @icon_size()})
-    this.$el.html(i.render().el)
+    if @picture
+      this.$el.html(@picture.render().el)
     this
   
   method_name: () ->
     @my_manifest.method_name
   
-  url: () ->
-    if @item[@method_name()]
-      @item[@method_name()]().src
-    else
-      '/images/error.png'
-  
-  tag_opt: () ->
-    if @item.methods(true).is_include(@method_name())
-      @item[@method_name()]()
-    else
-      {'src': '/images/error.png', 'width': Manifest.manifest().magic_numbers['thumbnail_width'], 'height': Manifest.manifest().magic_numbers['thumbnail_height']}
-  
diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee
index 5ca58d55..bd78f92a 100644
--- a/app/assets/javascripts/models/original_picture.js.coffee
+++ b/app/assets/javascripts/models/original_picture.js.coffee
@@ -7,7 +7,7 @@ class Pettanr.OriginalPicture extends Peta.Content
   
   defaults: {
     id: null,
-    artist_id: nil
+    artist_id: null
   } 
   
   is_visible: (operators) ->
diff --git a/app/assets/javascripts/models/speech_balloon_template.js.coffee b/app/assets/javascripts/models/speech_balloon_template.js.coffee
index f86a1677..55dafaf3 100644
--- a/app/assets/javascripts/models/speech_balloon_template.js.coffee
+++ b/app/assets/javascripts/models/speech_balloon_template.js.coffee
@@ -1,14 +1,5 @@
 class Pettanr.SpeechBalloonTemplate extends Peta.Template
-  relations: [{
-    type: Backbone.HasMany,
-    key: 'speech_balloons',
-    relatedModel: 'SpeechBalloon',
-    collectionType: 'SpeechBalloonCollection',
-    reverseRelation: {
-      key: 'livesIn',
-      includeInJSON: 'id'
-    }
-  }]
+  url: '/speech_balloon_templates/'
   
   @singular: () ->
     'SpeechBalloonTemplate'
@@ -20,21 +11,16 @@ class Pettanr.SpeechBalloonTemplate extends Peta.Template
     id: null
   } 
   
-  get_system_picture: () ->
+  system_picture: () ->
     new Pettanr.SystemPicture({id: @get('system_picture_id')})
   
   symbol_option: () ->
-    _this = this
-    r = @get_system_picture()
-    r.fetch({}).done () ->
-      _this.system_picture = r
-      _this.system_picture.tmb_opt_img_tag()
+    @system_picture()
   
   initialize: () ->
     if @id
       @url = @url + @id
-    @system_picture = null
-  
+    
 class Pettanr.SpeechBalloonTemplate.Collection extends Backbone.Collection
   model: Pettanr.SpeechBalloonTemplate
   url: '/speech_balloon_templates'
diff --git a/app/assets/javascripts/models/system_picture.js.coffee b/app/assets/javascripts/models/system_picture.js.coffee
index debf30b0..82e60c8e 100644
--- a/app/assets/javascripts/models/system_picture.js.coffee
+++ b/app/assets/javascripts/models/system_picture.js.coffee
@@ -1,5 +1,6 @@
 class Pettanr.SystemPicture extends Peta.SystemResource
   url: '/system_pictures/'
+  
   @singular: () ->
     'SystemPicture'