From c4fc0258365dccdd39e18629bb5d8e5873c658fc Mon Sep 17 00:00:00 2001 From: yasushiito Date: Tue, 9 Dec 2014 11:57:08 +0900 Subject: [PATCH] add load icon --- .../file_body/file_item/caption/default.js.coffee | 9 ++-- .../file_item/caption/default/face/base.js.coffee | 7 +++ .../caption/default/face/column.js.coffee | 1 + .../caption/default/face/method.js.coffee | 22 ++------ .../caption/default/link/action.js.coffee | 3 +- .../file_item/caption/default/link/base.js.coffee | 1 + .../caption/default/link/url_column.js.coffee | 3 +- .../file_body/file_item/summary/template.js.coffee | 2 +- .../file_body/file_item/symbol/default.js.coffee | 9 ++-- .../file_item/symbol/default/face/base.js.coffee | 7 +++ .../file_item/symbol/default/face/image.js.coffee | 5 +- .../symbol/default/face/picture.js.coffee | 17 +++--- .../file_item/symbol/default/link/action.js.coffee | 3 +- .../file_item/symbol/default/link/base.js.coffee | 1 + .../symbol/default/link/url_column.js.coffee | 3 +- app/assets/javascripts/models/balloon.js.coffee | 5 +- app/assets/javascripts/models/folder.js.coffee | 4 ++ .../javascripts/models/ground_picture.js.coffee | 5 +- app/assets/javascripts/models/license.js.coffee | 21 +++----- .../javascripts/models/original_picture.js.coffee | 5 +- .../javascripts/models/panel_picture.js.coffee | 5 +- app/assets/javascripts/models/picture.js.coffee | 15 ++++-- .../javascripts/models/resource_picture.js.coffee | 5 +- app/assets/javascripts/models/speech.js.coffee | 3 +- .../javascripts/models/speech_balloon.js.coffee | 5 +- .../models/speech_balloon_template.js.coffee | 5 +- .../javascripts/models/system_picture.js.coffee | 5 +- .../javascripts/models/writing_format.js.coffee | 5 +- .../javascripts/views/artists/summary.js.coffee | 3 +- .../javascripts/views/authors/summary.js.coffee | 3 +- .../javascripts/views/balloons/summary.js.coffee | 17 +++--- app/assets/javascripts/views/common.js.coffee | 57 ++++++++++++++++++--- .../javascripts/views/folders/summary.js.coffee | 3 +- .../views/ground_colors/summary.js.coffee | 15 ++++-- .../views/ground_pictures/summary.js.coffee | 21 +++++--- .../views/license_groups/summary.js.coffee | 3 +- .../javascripts/views/licenses/summary.js.coffee | 14 +++-- .../views/original_pictures/summary.js.coffee | 24 +++++---- .../views/panel_pictures/summary.js.coffee | 21 +++++--- .../javascripts/views/panels/summary.js.coffee | 11 ++-- .../javascripts/views/pictures/credit.js.coffee | 16 ++---- .../javascripts/views/pictures/summary.js.coffee | 3 +- .../views/resource_pictures/summary.js.coffee | 13 +++-- .../views/sheet_panels/summary.js.coffee | 3 +- .../speech_balloon_templates/summary.js.coffee | 3 +- .../views/speech_balloons/summary.js.coffee | 14 +++-- .../javascripts/views/speeches/summary.js.coffee | 17 +++--- .../views/system_pictures/summary.js.coffee | 3 +- .../views/writing_formats/summary.js.coffee | 3 +- app/assets/javascripts/work/filers.js.coffee.erb | 2 +- public/images/loading.gif | Bin 0 -> 2767 bytes public/local_manifest.json | 2 +- 52 files changed, 280 insertions(+), 172 deletions(-) create mode 100644 public/images/loading.gif diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee index e122aac4..60cce29f 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default.js.coffee @@ -6,13 +6,16 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo @link = m.LinkFactory.factory this, @my_manifest.link, @item render: () -> - if @my_manifest.link.type == 'none' - this.$el.html(@face.render().el) - else + if @has_link() this.$el.html(@link.render().el) @delegateEvents({'click .face': 'show'}) + else + this.$el.html(@face.el) this + has_link: () -> + @my_manifest.link.type != 'none' + show: () -> window.router.navigate(@link.url(), true); return false diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee index 14d2c2b0..d7d0f502 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/base.js.coffee @@ -6,6 +6,13 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo @default_caption = options.default_caption @my_manifest = options.my_manifest @item = options.item + @clear() + @listenTo(@item, 'ready:caption', @render) + + clear: () -> + icon = new Pettanr.Views.Common.LoadIcon() + this.$el.html(icon.render().el) + this render: () -> this diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/column.js.coffee index fa1975a4..9e98f828 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/column.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/column.js.coffee @@ -2,6 +2,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo initialize: (options) -> super(options) + @render() render: () -> if Pettanr.is_blank(@face()) diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee index 6a955ef6..612544d9 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/face/method.js.coffee @@ -2,25 +2,13 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo initialize: (options) -> super(options) + if @item[@method_name()] + @item[@method_name()]() render: () -> - if Pettanr.is_a_string(@face()) - if Pettanr.is_blank(@face()) - 'empty' - else - this.$el.html(@face()) - else - # render view when method return related model - this.$el.html(@face().render().el) - + this.$el.html(@item.caption_text) this - @template_file_name: () -> - if @face().is_blank() - 'empty' - else - 'column' - - face: () -> - @item[@my_manifest.method_name]() + method_name: () -> + @my_manifest.method_name diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/action.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/action.js.coffee index 618a8a15..cc3e1046 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/action.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/action.js.coffee @@ -5,8 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo render: () -> this.$el.attr('href', @url()) - # embed face everytime - this.$el.html(@default_caption.face.render().el) + this.$el.html(@face.el) this url: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee index b462051c..ac08b102 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/base.js.coffee @@ -5,6 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo @default_caption = options.default_caption @my_manifest = options.my_manifest @item = options.item + @face = @default_caption.face url: () -> raise "undefined url\n" diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee index da57715f..4abd7f31 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee @@ -5,8 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo render: () -> this.$el.attr('href', @url()) - # embed face everytime - this.$el.html(@default_caption.face.render().el) + this.$el.html(@face.el) this js_url: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/template.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/template.js.coffee index 96a1e004..54a5347e 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/template.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/summary/template.js.coffee @@ -6,6 +6,6 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SummaryItemCo render: () -> view = Pettanr.Views[@item.singular()] summary = new view[view.summary()]({item: @item}) - this.$el.html(summary.render().el) + this.$el.html(summary.el) this 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 1a5504e5..4e6534e2 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 @@ -6,13 +6,16 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol @link = m.LinkFactory.factory this, @my_manifest.link, @item render: () -> - if @my_manifest.link.type == 'none' - this.$el.html(@face.render().el) - else + if @has_link() this.$el.html(@link.render().el) @delegateEvents({'click .face': 'show'}) + else + this.$el.html(@face.el) this + has_link: () -> + @my_manifest.link.type != 'none' + show: () -> window.router.navigate(@link.url(), true) return false diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee index 2fd34418..a7ece41a 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/face/base.js.coffee @@ -6,6 +6,13 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol @default_symbol = options.default_symbol @my_manifest = options.my_manifest @item = options.item + @clear() + @listenTo(@item, 'ready:symbol', @render) + + clear: () -> + icon = new Pettanr.Views.Common.LoadIcon() + this.$el.html(icon.render().el) + this render: () -> this 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 12c5e01c..a3669430 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,16 +2,15 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol initialize: (options) -> super(options) - attr = @picture = new Pettanr.Image.SymbolImg({ attr: { src: @url() } }) + @render() render: () -> - if @picture - this.$el.html(@picture.render().el) + this.$el.html(@picture.render().el) this url: () -> 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 34642f93..bb611dbe 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 @@ -3,21 +3,18 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol initialize: (options) -> super(options) if @item[@method_name()] - @item[@method_name()]((pic) => - @picture = pic - @render() - ) + @item[@method_name()]() + + render: () -> + if @item.symbol_picture + this.$el.html(@item.symbol_picture.render().el) else - @picture = new Pettanr.Image.SymbolImg({ + picture = new Pettanr.Image.SymbolImg({ attr: { src: '/images/error.png' } }) - @render() - - render: () -> - if @picture - this.$el.html(@picture.render().el) + this.$el.html(picture.render().el) this method_name: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/action.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/action.js.coffee index 81e42b39..fa9a13ed 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/action.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/action.js.coffee @@ -5,8 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol render: () -> this.$el.attr('href', @url()) - # embed face everytime - this.$el.html(@default_symbol.face.render().el) + this.$el.html(@face.el) this url: () -> diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee index 6a30be17..54ec7df1 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/base.js.coffee @@ -5,6 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol @default_symbol = options.default_symbol @my_manifest = options.my_manifest @item = options.item + @face = @default_symbol.face url: () -> raise "undefined url\n" diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee index c6e74100..8ebf3186 100644 --- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee +++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/symbol/default/link/url_column.js.coffee @@ -5,8 +5,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.SymbolItemCol render: () -> this.$el.attr('href', @url()) - # embed face everytime - this.$el.html(@default_symbol.face.render().el) + this.$el.html(@face.el) this js_url: () -> diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee index 9ac7cb29..1089233d 100644 --- a/app/assets/javascripts/models/balloon.js.coffee +++ b/app/assets/javascripts/models/balloon.js.coffee @@ -25,14 +25,15 @@ class Pettanr.Balloon extends Peta.Element r_url: () -> '/system_pictures/' + @system_picture().filename() - symbol_option: (cb) -> + symbol_option: () -> sb = @speech_balloon() sb.fetch({cache: true}).done => sbt = sb.speech_balloon_template() sbt.fetch({cache: true}).done => sp = sbt.system_picture() sp.fetch({cache: true}).done => - cb(sp.tmb_opt_img_tag()) + @symbol_picture = sp.tmb_opt_img_tag() + @trigger('ready:symbol') initialize: () -> if @id diff --git a/app/assets/javascripts/models/folder.js.coffee b/app/assets/javascripts/models/folder.js.coffee index fe910066..dafdf520 100644 --- a/app/assets/javascripts/models/folder.js.coffee +++ b/app/assets/javascripts/models/folder.js.coffee @@ -15,6 +15,10 @@ class Pettanr.Folder extends Peta.Owner caption: () -> @get('name').replace(/\/$/, '').split('/').pop() + filer_caption: () -> + @caption_text = @caption() + @trigger('ready:caption') + is_remote: () -> if @get('category_id') == 10 true diff --git a/app/assets/javascripts/models/ground_picture.js.coffee b/app/assets/javascripts/models/ground_picture.js.coffee index 698ceb0d..0682e06a 100644 --- a/app/assets/javascripts/models/ground_picture.js.coffee +++ b/app/assets/javascripts/models/ground_picture.js.coffee @@ -35,10 +35,11 @@ class Pettanr.GroundPicture extends Peta.Element picture: picture }) - symbol_option: (cb) -> + symbol_option: () -> i = @picture() i.fetch({cache: true}).done => - cb(@tmb_opt_img_tag(i)) + @symbol_picture = i.tmb_opt_img_tag() + @trigger('ready:symbol') repeat_text: () -> Pettanr.GroundPicture.repeat_texts()[@get('repeat')] diff --git a/app/assets/javascripts/models/license.js.coffee b/app/assets/javascripts/models/license.js.coffee index b1901bfb..466b8410 100644 --- 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: () -> new Pettanr.SystemPicture({id: @get('system_picture_id')}) - symbol_option: (cb) -> + symbol_option: () -> i = @system_picture() i.fetch({cache: true}).done => - cb(i.tmb_opt_img_tag()) + @symbol_picture = i.tmb_opt_img_tag() + @trigger('ready:symbol') caption_with_group: () -> - new Pettanr.License.Caption({license: this, license_group: @license_group()}) + i = @license_group() + i.fetch({cache: true}).done => + @caption_text = i.get('caption') + '/' + @get('caption') + @trigger('ready:caption') initialize: () -> if @id @url = @url + @id -class Pettanr.License.Caption extends Backbone.View - tagName: 'span' - initialize: (options) -> - @license = options.license - @license_group = options.license_group - - render: () -> - @license_group.fetch({cache: true}).done => - this.$el.html(@license_group.get('caption') + '/' + @license.get('caption')) - this - diff --git a/app/assets/javascripts/models/original_picture.js.coffee b/app/assets/javascripts/models/original_picture.js.coffee index 96d16d9c..6eafde9b 100644 --- a/app/assets/javascripts/models/original_picture.js.coffee +++ b/app/assets/javascripts/models/original_picture.js.coffee @@ -39,8 +39,9 @@ class Pettanr.OriginalPicture extends Peta.Content }) symbol_option: (cb) -> - this.fetch({cache: true}).done => - cb(@tmb_opt_img_tag()) + @fetch({cache: true}).done => + @symbol_picture = @tmb_opt_img_tag() + @trigger('ready:symbol') revision: () -> new Pettanr.OriginalPicture.Head({original_picture: this}) diff --git a/app/assets/javascripts/models/panel_picture.js.coffee b/app/assets/javascripts/models/panel_picture.js.coffee index 8547958c..01a2c5bf 100644 --- a/app/assets/javascripts/models/panel_picture.js.coffee +++ b/app/assets/javascripts/models/panel_picture.js.coffee @@ -49,10 +49,11 @@ class Pettanr.PanelPicture extends Peta.Element picture: picture }) - symbol_option: (cb) -> + symbol_option: () -> i = @picture() i.fetch({cache: true}).done => - cb(@tmb_opt_img_tag(i)) + @symbol_picture = i.tmb_opt_img_tag() + @trigger('ready:symbol') element_face: () -> new Pettanr.Views.PanelPicture.ElementFace({element: this}) diff --git a/app/assets/javascripts/models/picture.js.coffee b/app/assets/javascripts/models/picture.js.coffee index 27471271..45924e5b 100644 --- a/app/assets/javascripts/models/picture.js.coffee +++ b/app/assets/javascripts/models/picture.js.coffee @@ -49,9 +49,8 @@ class Pettanr.Picture extends Peta.Content ln = Pettanr.to_s(@license().get('caption')) lgn + '[' + ln + ']' - symbol_option: (cb) -> - @fetch({cache: true}).done => - cb(@tmb_opt_img_tag()) + symbol_option: () -> + @tmb_opt_img_tag() is_enable: () -> if @head().resource_picture() @@ -85,6 +84,16 @@ class Pettanr.Picture extends Peta.Content credit_view: (with_icon = true) -> new Pettanr.Views.Picture.Credit({item: this, with_icon: with_icon}) + fetch: (options) -> + if @id + @credit_icon = @credit_icon_view() + @credit = null + f = (data, status) => + @credit = data + @trigger('ready') + $.get(@url + '/credit', null, f, 'html') + super(options) + initialize: () -> if @id @url = @url + @id diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee index 54a27bc2..141b66c2 100644 --- a/app/assets/javascripts/models/resource_picture.js.coffee +++ b/app/assets/javascripts/models/resource_picture.js.coffee @@ -49,9 +49,10 @@ class Pettanr.ResourcePicture extends Peta.Content ln = Pettanr.to_s(@license().get('caption')) lgn + '[' + ln + ']' - symbol_option: (cb) -> + symbol_option: () -> @fetch({cache: true}).done => - cb(@tmb_opt_img_tag()) + @symbol_picture = @tmb_opt_img_tag() + @trigger('ready:symbol') credit_icon_view: () -> new Pettanr.Views.ResourcePicture.CreditIcon({item: this}) diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee index 50207cc6..97e5a62f 100644 --- a/app/assets/javascripts/models/speech.js.coffee +++ b/app/assets/javascripts/models/speech.js.coffee @@ -28,7 +28,8 @@ class Pettanr.Speech extends Peta.Element sbt.fetch({cache: true}).done => sp = sbt.system_picture() sp.fetch({cache: true}).done => - cb(sp.tmb_opt_img_tag()) + @symbol_picture = sp.tmb_opt_img_tag() + @trigger('ready:symbol') text_align_text: () -> Pettanr.Speech.text_align_texts()[@get('text_align')] diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee index 643a8dff..a3306686 100644 --- a/app/assets/javascripts/models/speech_balloon.js.coffee +++ b/app/assets/javascripts/models/speech_balloon.js.coffee @@ -22,12 +22,13 @@ class Pettanr.SpeechBalloon extends Peta.Element @has_picture: () -> false - symbol_option: (cb) -> + symbol_option: () -> sbt = @speech_balloon_template() sbt.fetch({cache: true}).done => sp = sbt.system_picture() sp.fetch({cache: true}).done => - cb(sp.tmb_opt_img_tag()) + @symbol_picture = sp.tmb_opt_img_tag() + @trigger('ready:symbol') plain_scenario: () -> @get('caption') diff --git a/app/assets/javascripts/models/speech_balloon_template.js.coffee b/app/assets/javascripts/models/speech_balloon_template.js.coffee index 91431f7c..3698254b 100644 --- a/app/assets/javascripts/models/speech_balloon_template.js.coffee +++ b/app/assets/javascripts/models/speech_balloon_template.js.coffee @@ -14,10 +14,11 @@ class Pettanr.SpeechBalloonTemplate extends Peta.Template system_picture: () -> new Pettanr.SystemPicture({id: @get('system_picture_id')}) - symbol_option: (cb) -> + symbol_option: () -> i = @system_picture() i.fetch({cache: true}).done => - cb(i.tmb_opt_img_tag()) + @symbol_picture = i.tmb_opt_img_tag() + @trigger('ready:symbol') parsed_settings: () -> JSON.parse(@get('settings')) diff --git a/app/assets/javascripts/models/system_picture.js.coffee b/app/assets/javascripts/models/system_picture.js.coffee index 52f514b6..36db60aa 100644 --- a/app/assets/javascripts/models/system_picture.js.coffee +++ b/app/assets/javascripts/models/system_picture.js.coffee @@ -34,9 +34,10 @@ class Pettanr.SystemPicture extends Peta.SystemResource picture: this }) - symbol_option: (cb) -> + symbol_option: () -> @fetch({cache: true}).done => - cb(@tmb_opt_img_tag()) + @symbol_picture = @tmb_opt_img_tag() + @trigger('ready:symbol') initialize: () -> if @id diff --git a/app/assets/javascripts/models/writing_format.js.coffee b/app/assets/javascripts/models/writing_format.js.coffee index 92d189bd..61e08fcb 100644 --- a/app/assets/javascripts/models/writing_format.js.coffee +++ b/app/assets/javascripts/models/writing_format.js.coffee @@ -14,10 +14,11 @@ class Pettanr.WritingFormat extends Peta.Template system_picture: () -> new Pettanr.SystemPicture({id: @get('system_picture_id')}) - symbol_option: (cb) -> + symbol_option: () -> i = @system_picture() i.fetch({cache: true}).done => - cb(i.tmb_opt_img_tag()) + @symbol_picture = i.tmb_opt_img_tag() + @trigger('ready:symbol') initialize: () -> if @id diff --git a/app/assets/javascripts/views/artists/summary.js.coffee b/app/assets/javascripts/views/artists/summary.js.coffee index 5dac2fe0..371fb423 100644 --- a/app/assets/javascripts/views/artists/summary.js.coffee +++ b/app/assets/javascripts/views/artists/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.Artist.Summary extends Backbone.View +class Pettanr.Views.Artist.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/authors/summary.js.coffee b/app/assets/javascripts/views/authors/summary.js.coffee index 944de304..ed9a3ef6 100644 --- a/app/assets/javascripts/views/authors/summary.js.coffee +++ b/app/assets/javascripts/views/authors/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.Author.Summary extends Backbone.View +class Pettanr.Views.Author.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/balloons/summary.js.coffee b/app/assets/javascripts/views/balloons/summary.js.coffee index ad0930ee..087fff90 100644 --- a/app/assets/javascripts/views/balloons/summary.js.coffee +++ b/app/assets/javascripts/views/balloons/summary.js.coffee @@ -1,15 +1,20 @@ -class Pettanr.Views.Balloon.Summary extends Backbone.View +class Pettanr.Views.Balloon.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item + @load() + + load: () -> @speech_balloon = @item.speech_balloon() + @speech_balloon.fetch({cache: true}).done => + @panel = @speech_balloon.panel() + @panel.fetch({cache: true}).done => + @panel_icon = new Pettanr.Views.Common.Icon({item: @panel, half: true}) + @trigger('ready') render: () -> this.$el.html('') - @speech_balloon.fetch({cache: true}).done => - panel = @speech_balloon.panel() - panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/common.js.coffee b/app/assets/javascripts/views/common.js.coffee index bec019a7..e958bde3 100644 --- a/app/assets/javascripts/views/common.js.coffee +++ b/app/assets/javascripts/views/common.js.coffee @@ -1,4 +1,22 @@ class Pettanr.Views.Common +class Pettanr.Views.Common.LoadIcon extends Tag.Img + + initialize: () -> + @attr = {} + @width = Manifest.manifest().magic_numbers['thumbnail_width'] + @height = Manifest.manifest().magic_numbers['thumbnail_height'] + @width = Pettanr.to_i(@width/2) + @height = Pettanr.to_i(@height/2) + @attr['src'] = '/images/loading.gif' + @attr['width'] = @width + @attr['height'] = @height + @attr['alt'] = 'Loading' + @attr['title'] = 'Loading' + opt = { + attr: @attr, + } + super(opt) + class Pettanr.Views.Common.Icon extends Backbone.View tagName: 'span' @@ -54,55 +72,78 @@ class Pettanr.Views.Common.IconWithCaption extends Backbone.View this.$el.append(@caption.render().el) this +class Pettanr.Views.Common.Summary extends Backbone.View + + initialize: (options) -> + @clear() + @listenTo(this, 'ready', @render) + + clear: () -> + icon = new Pettanr.Views.Common.LoadIcon() + this.$el.html(icon.render().el) + this + + render: () -> + this.$el.html('') + this + class Pettanr.Views.Common.Binder -class Pettanr.Views.Common.Binder.Summary extends Backbone.View +class Pettanr.Views.Common.Binder.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item @visible_t = options.visible_t @visible_column_name = options.visible_column_name + @load() + + load: () -> @visible = new Tag.Div({ content: Pettanr.AppHelper.t_selected_item(@visible_t, @item.get(@visible_column_name)) }) @author = @item.author() @author.fetch({cache: true}).done => @author_icon_with_caption = @author.icon_with_caption_view(true, 'name', 12) - @render() + @trigger('ready') render: () -> this.$el.html('') this.$el.append(@visible.render().el) - if @author_icon_with_caption - this.$el.append(@author_icon_with_caption.render().el) + this.$el.append(@author_icon_with_caption.render().el) this class Pettanr.Views.Common.Leaf -class Pettanr.Views.Common.Leaf.Summary extends Backbone.View +class Pettanr.Views.Common.Leaf.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item @binder_item_name = options.binder_item_name @destination_item_name = options.destination_item_name + @load() + + load: () -> @binder = @item[@binder_item_name]() @binder.fetch({cache: true}).done => @binder_icon = @binder.icon_view(true) @binder_author = @binder.author() @binder_author.fetch({cache: true}).done => @binder_author_icon_with_caption = @binder_author.icon_with_caption_view(true, 'name', 12) - @render() + @trigger('ready') @destination = @item[@destination_item_name]() @destination.fetch({cache: true}).done => @destination_icon = @destination.icon_view(true) @destination_author = @destination.author() @destination_author.fetch({cache: true}).done => @destination_author_icon_with_caption = @destination_author.icon_with_caption_view(true, 'name', 12) - @render() + @trigger('ready') render: () -> this.$el.html('') - if @binder_author_icon_with_caption and @destination_author_icon_with_caption + if @binder_author_icon_with_caption this.$el.append(@binder_icon.render().el) this.$el.append(@binder_author_icon_with_caption.render().el) + if @destination_author_icon_with_caption this.$el.append(@destination_icon.render().el) this.$el.append(@destination_author_icon_with_caption.render().el) this diff --git a/app/assets/javascripts/views/folders/summary.js.coffee b/app/assets/javascripts/views/folders/summary.js.coffee index 602650b6..f12739fd 100644 --- a/app/assets/javascripts/views/folders/summary.js.coffee +++ b/app/assets/javascripts/views/folders/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.Folder.Summary extends Backbone.View +class Pettanr.Views.Folder.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/ground_colors/summary.js.coffee b/app/assets/javascripts/views/ground_colors/summary.js.coffee index 8b38aaad..e0632e2d 100644 --- a/app/assets/javascripts/views/ground_colors/summary.js.coffee +++ b/app/assets/javascripts/views/ground_colors/summary.js.coffee @@ -1,13 +1,18 @@ -class Pettanr.Views.GroundColor.Summary extends Backbone.View +class Pettanr.Views.GroundColor.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item + @load() - render: () -> - this.$el.html('') + load: () -> panel = @item.panel() panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + @panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/ground_pictures/summary.js.coffee b/app/assets/javascripts/views/ground_pictures/summary.js.coffee index f04667a5..cbecb185 100644 --- a/app/assets/javascripts/views/ground_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/summary.js.coffee @@ -1,17 +1,22 @@ -class Pettanr.Views.GroundPicture.Summary extends Backbone.View +class Pettanr.Views.GroundPicture.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item - @picture = @item.picture() + @load() - render: () -> - this.$el.html('') + load: () -> + @picture = @item.picture() @picture.fetch({cache: true}).done => - credit = @picture.credit_view(false) - this.$el.append(credit.render().el) + @credit = @picture.credit_view(false) panel = @item.panel() panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + @panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@credit.render().el) + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/license_groups/summary.js.coffee b/app/assets/javascripts/views/license_groups/summary.js.coffee index 01a65cf0..0ccbfdaa 100644 --- a/app/assets/javascripts/views/license_groups/summary.js.coffee +++ b/app/assets/javascripts/views/license_groups/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.LicenseGroup.Summary extends Backbone.View +class Pettanr.Views.LicenseGroup.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/licenses/summary.js.coffee b/app/assets/javascripts/views/licenses/summary.js.coffee index 37c83015..09c718a1 100644 --- a/app/assets/javascripts/views/licenses/summary.js.coffee +++ b/app/assets/javascripts/views/licenses/summary.js.coffee @@ -1,17 +1,21 @@ -class Pettanr.Views.License.Summary extends Backbone.View +class Pettanr.Views.License.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> @item = options.item + @load() - render: () -> - this.$el.html('') + load: () -> @system_picture = @item.system_picture() @system_picture.fetch({cache: true}).done => - img = new Tag.Img({ + @img = new Tag.Img({ attr: { src: @system_picture.r_url() } }) - this.$el.html(img.render().el) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.html(@img.render().el) this diff --git a/app/assets/javascripts/views/original_pictures/summary.js.coffee b/app/assets/javascripts/views/original_pictures/summary.js.coffee index 2d05a1f5..5c8cf7cc 100644 --- a/app/assets/javascripts/views/original_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/original_pictures/summary.js.coffee @@ -1,23 +1,29 @@ -class Pettanr.Views.OriginalPicture.Summary extends Backbone.View +class Pettanr.Views.OriginalPicture.Summary extends Pettanr.Views.Common.Summary className: 'op-smy' initialize: (options) -> + super(options) @item = options.item #@item = new Pettanr.OriginalPicture({id: options.item.get('id')}) # with resource_picture + @load() - render: () -> + load: () -> @item.fetch({cache: false}).done => - this.$el.html('') - visible = new Tag.Span({ + @visible = new Tag.Span({ class_name: 'state', content: I18n.t('original_pictures.' + @item.state()) }) - this.$el.append(visible.render().el) if ra = @item.get('resource_picture') resource_picture = new Pettanr.ResourcePicture(ra) - credit = resource_picture.credit_view(true) - this.$el.append(credit.render().el) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) + @credit = resource_picture.credit_view(true) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@visible.render().el) + if @credit + this.$el.append(@credit.render().el) + rb = new Tag.RowBreak() + this.$el.append(rb.render().el) this diff --git a/app/assets/javascripts/views/panel_pictures/summary.js.coffee b/app/assets/javascripts/views/panel_pictures/summary.js.coffee index fff5289f..89adb659 100644 --- a/app/assets/javascripts/views/panel_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/summary.js.coffee @@ -1,17 +1,22 @@ -class Pettanr.Views.PanelPicture.Summary extends Backbone.View +class Pettanr.Views.PanelPicture.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item - @picture = @item.picture() + @load() - render: () -> - this.$el.html('') + load: () -> + @picture = @item.picture() @picture.fetch({cache: true}).done => - credit = @picture.credit_view(false) - this.$el.append(credit.render().el) + @credit = @picture.credit_view(false) panel = @item.panel() panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + @panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@credit.render().el) + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/panels/summary.js.coffee b/app/assets/javascripts/views/panels/summary.js.coffee index 30a7f137..f89b2420 100644 --- a/app/assets/javascripts/views/panels/summary.js.coffee +++ b/app/assets/javascripts/views/panels/summary.js.coffee @@ -1,23 +1,26 @@ -class Pettanr.Views.Panel.Summary extends Backbone.View +class Pettanr.Views.Panel.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item options['visible_t'] = 'panel_publish_items' options['visible_column_name'] = 'publish' @visible_t = options.visible_t @visible_column_name = options.visible_column_name + @load() + + load: () -> @visible = new Tag.Div({ content: Pettanr.AppHelper.t_selected_item(@visible_t, @item.get(@visible_column_name)) }) @author = @item.author() @author.fetch({cache: true}).done => @author_icon_with_caption = @author.icon_with_caption_view(true, 'name', 12) - @render() + @trigger('ready') render: () -> this.$el.html('') this.$el.append(@visible.render().el) - if @author_icon_with_caption - this.$el.append(@author_icon_with_caption.render().el) + this.$el.append(@author_icon_with_caption.render().el) this diff --git a/app/assets/javascripts/views/pictures/credit.js.coffee b/app/assets/javascripts/views/pictures/credit.js.coffee index 4f6f21ed..d8cf4dfd 100644 --- a/app/assets/javascripts/views/pictures/credit.js.coffee +++ b/app/assets/javascripts/views/pictures/credit.js.coffee @@ -6,21 +6,13 @@ class Pettanr.Views.Picture.Credit extends Backbone.View @item = options.item @with_icon = options.with_icon @url = @item.url + '/credit' + @listenTo(@item, 'ready', @render) render: () -> this.$el.html('') if @with_icon - p = @item.credit_icon_view() - this.$el.append(p.render().el) - if Pettanr.credits[@url] - this.$el.append(Pettanr.credits[@url]) - this.$el.append((new Tag.RowBreak()).render().el) - else - f = (data, status) => - Pettanr.credits[@url] = data - this.$el.append(data) - rb = new Tag.RowBreak() - this.$el.append(rb.render().el) - $.get(@url, null, f, 'html') + this.$el.append(@item.credit_icon.render().el) + this.$el.append(@item.credit) + this.$el.append((new Tag.RowBreak()).render().el) this diff --git a/app/assets/javascripts/views/pictures/summary.js.coffee b/app/assets/javascripts/views/pictures/summary.js.coffee index 341c0194..47805392 100644 --- a/app/assets/javascripts/views/pictures/summary.js.coffee +++ b/app/assets/javascripts/views/pictures/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.Picture.Summary extends Backbone.View +class Pettanr.Views.Picture.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/resource_pictures/summary.js.coffee b/app/assets/javascripts/views/resource_pictures/summary.js.coffee index 8acbdeba..b941770c 100644 --- a/app/assets/javascripts/views/resource_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/resource_pictures/summary.js.coffee @@ -1,13 +1,18 @@ -class Pettanr.Views.ResourcePicture.Summary extends Backbone.View +class Pettanr.Views.ResourcePicture.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item + @load() + + load: () -> @picture = @item.picture() + @picture.fetch({cache: true}).done => + @credit = @picture.credit_view(false) + @trigger('ready') render: () -> this.$el.html('') - @picture.fetch({cache: true}).done => - credit = @picture.credit_view(false) - this.$el.append(credit.render().el) + this.$el.append(@credit.render().el) this diff --git a/app/assets/javascripts/views/sheet_panels/summary.js.coffee b/app/assets/javascripts/views/sheet_panels/summary.js.coffee index 59ecc1a0..461d0c3c 100644 --- a/app/assets/javascripts/views/sheet_panels/summary.js.coffee +++ b/app/assets/javascripts/views/sheet_panels/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.SheetPanel.Summary extends Backbone.View +class Pettanr.Views.SheetPanel.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/speech_balloon_templates/summary.js.coffee b/app/assets/javascripts/views/speech_balloon_templates/summary.js.coffee index 333ef0f5..740483aa 100644 --- a/app/assets/javascripts/views/speech_balloon_templates/summary.js.coffee +++ b/app/assets/javascripts/views/speech_balloon_templates/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.SpeechBalloonTemplate.Summary extends Backbone.View +class Pettanr.Views.SpeechBalloonTemplate.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/speech_balloons/summary.js.coffee b/app/assets/javascripts/views/speech_balloons/summary.js.coffee index ef310ab9..38910828 100644 --- a/app/assets/javascripts/views/speech_balloons/summary.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/summary.js.coffee @@ -1,13 +1,17 @@ -class Pettanr.Views.SpeechBalloon.Summary extends Backbone.View +class Pettanr.Views.SpeechBalloon.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> @item = options.item + @load() - render: () -> - this.$el.html('') + load: () -> panel = @item.panel() panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + @panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/speeches/summary.js.coffee b/app/assets/javascripts/views/speeches/summary.js.coffee index 0b10eef7..8c1eccdf 100644 --- a/app/assets/javascripts/views/speeches/summary.js.coffee +++ b/app/assets/javascripts/views/speeches/summary.js.coffee @@ -1,15 +1,20 @@ -class Pettanr.Views.Speech.Summary extends Backbone.View +class Pettanr.Views.Speech.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> + super(options) @item = options.item - @speech_balloon = @item.speech_balloon() + @load() - render: () -> - this.$el.html('') + load: () -> + @speech_balloon = @item.speech_balloon() @speech_balloon.fetch({cache: true}).done => panel = @speech_balloon.panel() panel.fetch({cache: true}).done => - panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) - this.$el.append(panel_icon.render().el) + @panel_icon = new Pettanr.Views.Common.Icon({item: panel, half: true}) + @trigger('ready') + + render: () -> + this.$el.html('') + this.$el.append(@panel_icon.render().el) this diff --git a/app/assets/javascripts/views/system_pictures/summary.js.coffee b/app/assets/javascripts/views/system_pictures/summary.js.coffee index 703d488d..9a4f910f 100644 --- a/app/assets/javascripts/views/system_pictures/summary.js.coffee +++ b/app/assets/javascripts/views/system_pictures/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.SystemPicture.Summary extends Backbone.View +class Pettanr.Views.SystemPicture.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/views/writing_formats/summary.js.coffee b/app/assets/javascripts/views/writing_formats/summary.js.coffee index 8d45d378..97287225 100644 --- a/app/assets/javascripts/views/writing_formats/summary.js.coffee +++ b/app/assets/javascripts/views/writing_formats/summary.js.coffee @@ -1,7 +1,8 @@ -class Pettanr.Views.WritingFormat.Summary extends Backbone.View +class Pettanr.Views.WritingFormat.Summary extends Pettanr.Views.Common.Summary initialize: (options) -> super(options) + @trigger('ready') render: () -> this.$el.html('') diff --git a/app/assets/javascripts/work/filers.js.coffee.erb b/app/assets/javascripts/work/filers.js.coffee.erb index b7be47ea..15565230 100644 --- a/app/assets/javascripts/work/filers.js.coffee.erb +++ b/app/assets/javascripts/work/filers.js.coffee.erb @@ -9,7 +9,7 @@ face: { type: 'method', args: { - method_name: 'caption', + method_name: 'filer_caption', }, }, }, diff --git a/public/images/loading.gif b/public/images/loading.gif new file mode 100644 index 0000000000000000000000000000000000000000..f864d5fd38b7466c76b5a36dc0e3e9455c0126e2 GIT binary patch literal 2767 zcmeH``%_bA0*1eHPVNawNVtR;Fkp-nQj8edfS`v<5L7TgR6wi;WfgH-0}4fE+c_uU zB6tf6auF}FAcDdgg|bMU&H)LR5jARM!8$tuwd$nHqS?K-=JNZ+yGvz=Iegxp{+qWGZ9j{-%9vvN>n3$NJp6==CAqYaF(LfM1Z{EEA{{Gt9 z+Ba|B7z_sR+xabl|E~mm-*OXmhLq??y)HONjX>1ze1D?RIn=G1`RR-%fb}zgSh6^a z(}Zw20U1L^Cs9UcyJfc+al#}J2xVlYUoR{`gd&QDxAb1w4>I~5gc?ccq(G+T!I;H};U_uyHR0@hr>Qk1P1=6fvUBhR zb|&^^cEQtu&W}=-=YR7o5UI)AD*~%J7bkVd5`xrdw{bHm;|Bf^_|FG$9l}`ruhnVF zO%=6X*I#yro*pmfB;-A0cVjz73Qy)`oa=df_3Bx6!M3TNALf9BwI*di`jhdovR(I= zFT31zui1Xw??+Ym-lWNq=V6~8tt012$@*hy3So0QNJ#eIJ4Yh{qJ+aTY>ng8W1p4BrwB_>i7AY-xmGrA}hAeq`aX(yx~=c&|=$w&*&PpKd;G@@0oXK@D0x=;tyY&Eb|HKPsM z71v`PO)na3pfO*xUD8Z|CQju)c+RSAH=5V^4vb9Q2JwHwt|-INt|!nD?AlRxF5ZT8 zaA9~hGb$~rMhQh_0+31$tkzyLi>X3c7>F!|Jyn`+5{LG=E`sIQbHA8!=`uday6D6Y zNtVL?j^`6A%UuwO!`}j#s~H?w=P<5}Z2)*PPx|5q$MM+1K6_d_cie9JVArbrB2sRy zOl**1Mc+|zLM>munG#O|##RApuODr^1+pL-?SHX+D6Dz_@%-Oo(fM&hHYZ-jWU5jf z&nBYG;>F6&Y`veoLdZ@0WyrDsuXOP)9g*C`A(+R`Ryc2+9w_DJNaf@Dzg?~N{uI_} zjV(!yygvrGv#KF*Mt{6H^v1Ve=hQyF2^E~bd#&iZg;(%dS^nM;oGSF1Y^&rY}Ian zFrp%SBGPyN{Z?t%Mo#!qgLQ2)k{>KAv?=zezKN*qPRf>^4QjcWgyxiC}7Vb6vGrBLR(1J&B%*gb{`!Jljb^2%jB$ zFBNUHANC6Q?0~M}cVtgk_;_DAB-BE?2dP z(C9OIXza3Ao-@UyqX%`5cjg#cHl!uHq;&?~JO{eE+A2KSSD)s8v&CiV$kV$A=DG@i z;6JY7z*8oPdj@bbJQoTAENW#ls(ucbGA#yhN>zbWqBTbLl>rGqOAY+` z=psSt8VQE=9+X8^$l@oeDzRvja79ry3nvLcOR7+)bIFyJVoz4}URM-47_u>V zY*^e(o`?|l++*Y0uQ#&dKapW1o?J{jx+*_gKV^cW+W87KI7hZ5viXv$$=1IR^Z~yA XWBrHU7iSEP8X8hQyAJO{V6g1pwSv80 literal 0 HcmV?d00001 diff --git a/public/local_manifest.json b/public/local_manifest.json index b8ffbf86..c466554f 100644 --- a/public/local_manifest.json +++ b/public/local_manifest.json @@ -1459,7 +1459,7 @@ "face": { "type": "method", "args": { - "method_name": "caption" + "method_name": "filer_caption" } } } -- 2.11.0