From a2476d007b31867d0c17898c358bde615e830d91 Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 1 May 2015 08:19:20 +0900 Subject: [PATCH] fix:balloon r --- .../addons/circle_speech_balloons/init.js.coffee | 18 +++-------------- .../addons/plain_speech_balloons/init.js.coffee | 18 +++-------------- .../addons/square_speech_balloons/init.js.coffee | 18 +++-------------- .../locmare/form/field/tag/select.js.coffee | 12 +++++------ app/assets/javascripts/models/balloon.js.coffee | 4 ++-- app/assets/javascripts/models/speech.js.coffee | 6 +++--- .../javascripts/models/speech_balloon.js.coffee | 4 ++-- .../javascripts/views/balloons/form.js.coffee | 12 ++++++++++- .../views/speech_balloons/new_element.js.coffee | 23 ++++++++++++++-------- app/assets/stylesheets/test.css.scss | 1 + 10 files changed, 49 insertions(+), 67 deletions(-) diff --git a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee index d12a6788..f9d16c8c 100644 --- a/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee +++ b/app/assets/javascripts/addons/circle_speech_balloons/init.js.coffee @@ -82,8 +82,7 @@ class Pettanr.CircleSpeechBalloon.Speech extends Backbone.Model @engine_name() + '/speeches' class Pettanr.CircleSpeechBalloon.SpeechBalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> speech_balloon_extend: () -> @new_speech_balloon() if not @sbex @@ -99,8 +98,7 @@ class Pettanr.CircleSpeechBalloon.SpeechBalloonModule @sbex.supply_default() class Pettanr.CircleSpeechBalloon.BalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> @set({ x: 0, y: 0, @@ -110,15 +108,6 @@ class Pettanr.CircleSpeechBalloon.BalloonModule }) @select_system_picture() - hoge_templates: () -> - if !@templates.speech_balloon_template - retriever = new Pettanr.Cache.Retriever(Pettanr.SpeechBalloonTemplate, @get('speech_balloon_template_id')) - @listenTo(retriever, 'retrieve', @retrieve_speech_balloon_template) - retriever.retrieve() - - retrieve_speech_balloon_template: (speech_balloon_template) -> - @templates.speech_balloon_template = speech_balloon_template - balloon_extend: () -> @new_balloon() if not @bex @bex @@ -158,8 +147,7 @@ class Pettanr.CircleSpeechBalloon.BalloonModule Math.floor(((round_r + offset) % 360) / @r_step()) class Pettanr.CircleSpeechBalloon.SpeechModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> s = @parsed_settings()['0']['speech'] @set({ x: s['x_rate'], diff --git a/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee index 2564a887..5fd8e797 100644 --- a/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee +++ b/app/assets/javascripts/addons/plain_speech_balloons/init.js.coffee @@ -82,8 +82,7 @@ class Pettanr.PlainSpeechBalloon.Speech extends Backbone.Model @engine_name() + '/speeches' class Pettanr.PlainSpeechBalloon.SpeechBalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> speech_balloon_extend: () -> @new_speech_balloon() if not @sbex @@ -98,8 +97,7 @@ class Pettanr.PlainSpeechBalloon.SpeechBalloonModule @sbex = new Pettanr.PlainSpeechBalloon.SpeechBalloon(params) class Pettanr.PlainSpeechBalloon.BalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> @set({ x: 0, y: 0, @@ -109,15 +107,6 @@ class Pettanr.PlainSpeechBalloon.BalloonModule }) @select_system_picture() - hoge_templates: () -> - if !@templates.speech_balloon_template - retriever = new Pettanr.Cache.Retriever(Pettanr.SpeechBalloonTemplate, @get('speech_balloon_template_id')) - @listenTo(retriever, 'retrieve', @retrieve_speech_balloon_template) - retriever.retrieve() - - retrieve_speech_balloon_template: (speech_balloon_template) -> - @templates.speech_balloon_template = speech_balloon_template - balloon_extend: () -> @new_balloon() if not @bex @bex @@ -148,8 +137,7 @@ class Pettanr.PlainSpeechBalloon.BalloonModule 0 class Pettanr.PlainSpeechBalloon.SpeechModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> s = @parsed_settings()['all']['speech'] @set({ x: s['x_rate'], diff --git a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee index de26c169..f1893af1 100644 --- a/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee +++ b/app/assets/javascripts/addons/square_speech_balloons/init.js.coffee @@ -82,8 +82,7 @@ class Pettanr.SquareSpeechBalloon.Speech extends Backbone.Model @engine_name() + '/speeches' class Pettanr.SquareSpeechBalloon.SpeechBalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> speech_balloon_extend: () -> @new_speech_balloon() if not @sbex @@ -99,8 +98,7 @@ class Pettanr.SquareSpeechBalloon.SpeechBalloonModule @sbex.supply_default() class Pettanr.SquareSpeechBalloon.BalloonModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> @set({ x: 0, y: 0, @@ -110,15 +108,6 @@ class Pettanr.SquareSpeechBalloon.BalloonModule }) @select_system_picture() - hoge_templates: () -> - if !@templates.speech_balloon_template - retriever = new Pettanr.Cache.Retriever(Pettanr.SpeechBalloonTemplate, @get('speech_balloon_template_id')) - @listenTo(retriever, 'retrieve', @retrieve_speech_balloon_template) - retriever.retrieve() - - retrieve_speech_balloon_template: (speech_balloon_template) -> - @templates.speech_balloon_template = speech_balloon_template - balloon_extend: () -> @new_balloon() if not @bex @bex @@ -146,8 +135,7 @@ class Pettanr.SquareSpeechBalloon.BalloonModule 0 class Pettanr.SquareSpeechBalloon.SpeechModule - supply_default: (templates) -> - @templates = templates + supply_default: () -> s = @parsed_settings()['all']['speech'] @set({ x: s['x_rate'], diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee index 57e000ee..5a155667 100644 --- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee +++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee @@ -5,17 +5,17 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod } render: () -> - this.$el.html('') - @attr = { - name: @form_field_name(), - } - _.extend(@attr, @options()) - this.$el.attr(@attr) @select_values((members) => values = if @model_attribute_manifest().source.translate() Pettanr.AppHelper.t_select_items(members) else members + this.$el.html('') + @attr = { + name: @form_field_name(), + } + _.extend(@attr, @options()) + this.$el.attr(@attr) _.each values, (member) => selected = if @is_selected(member) ' selected' diff --git a/app/assets/javascripts/models/balloon.js.coffee b/app/assets/javascripts/models/balloon.js.coffee index 94fb4b75..f50e03b0 100644 --- a/app/assets/javascripts/models/balloon.js.coffee +++ b/app/assets/javascripts/models/balloon.js.coffee @@ -16,9 +16,9 @@ class Pettanr.Balloon extends Peta.Element r: 0 } - pick: (templates) -> + pick: () -> # - speech_balloon_template = templates.speech_balloon_template + speech_balloon_template = @templates.speech_balloon_template { speech_balloon_template_id: speech_balloon_template.get('id'), speech_balloon_template_module_name: speech_balloon_template.get('module_name'), diff --git a/app/assets/javascripts/models/speech.js.coffee b/app/assets/javascripts/models/speech.js.coffee index a91413d0..366cd094 100644 --- a/app/assets/javascripts/models/speech.js.coffee +++ b/app/assets/javascripts/models/speech.js.coffee @@ -15,10 +15,10 @@ class Pettanr.Speech extends Peta.Element height: 100 } - pick: (templates) -> + pick: () -> # - speech_balloon_template = templates.speech_balloon_template - writing_format = templates.writing_format + speech_balloon_template = @templates.speech_balloon_template + writing_format = @templates.writing_format { speech_balloon_template_id: speech_balloon_template.get('id'), speech_balloon_template_module_name: speech_balloon_template.get('module_name'), diff --git a/app/assets/javascripts/models/speech_balloon.js.coffee b/app/assets/javascripts/models/speech_balloon.js.coffee index 4daf06a7..359669ac 100644 --- a/app/assets/javascripts/models/speech_balloon.js.coffee +++ b/app/assets/javascripts/models/speech_balloon.js.coffee @@ -19,9 +19,9 @@ class Pettanr.SpeechBalloon extends Peta.Element @traceable_item_names: () -> ['speech', 'balloon'] - pick: (templates) -> + pick: () -> # - speech_balloon_template = templates.speech_balloon_template + speech_balloon_template = @templates.speech_balloon_template { speech_balloon_template_id: speech_balloon_template.get('id'), speech_balloon_template_module_name: speech_balloon_template.get('module_name') diff --git a/app/assets/javascripts/views/balloons/form.js.coffee b/app/assets/javascripts/views/balloons/form.js.coffee index dba310ed..f504cce1 100644 --- a/app/assets/javascripts/views/balloons/form.js.coffee +++ b/app/assets/javascripts/views/balloons/form.js.coffee @@ -3,7 +3,17 @@ class Pettanr.Views.Balloon.Form extends Locmare.Form initialize: (options) -> super(options) @listenTo(@item, 'input:r', @input_r) - @item.hoge_templates() + + render: () -> + s = Form.__super__.render + retrieve_speech_balloon_template = (speech_balloon_template) => + @item.templates = {} + @item.templates.speech_balloon_template = speech_balloon_template + s.call(this) + retriever = new Pettanr.Cache.Retriever(Pettanr.SpeechBalloonTemplate, @item.get('speech_balloon_template_id')) + @listenTo(retriever, 'retrieve', retrieve_speech_balloon_template) + retriever.retrieve() + this input_r: () -> @item.select_system_picture() diff --git a/app/assets/javascripts/views/speech_balloons/new_element.js.coffee b/app/assets/javascripts/views/speech_balloons/new_element.js.coffee index 0fa2e8b1..d10c67ca 100644 --- a/app/assets/javascripts/views/speech_balloons/new_element.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/new_element.js.coffee @@ -55,29 +55,36 @@ class Pettanr.Views.SpeechBalloon.NewElement extends Backbone.View # Pick @listenTo(this, 'ready', @ready) speech_balloon_template = item - writing_format = new Pettanr.WritingFormat({id: 1}) - writing_format.fetch({cache: true}).done => + writing_format_list = Locmare.ListGroup.list( + 'writing_formats', 'index', {} + ) + writing_format_list.open(() => + writing_format = writing_format_list.items()[0] templates = { speech_balloon_template: speech_balloon_template, writing_format: writing_format } new_item = new @target_model() - new_item.set(new_item.pick(templates), {silent: true}) + new_item.templates = templates + new_item.set(new_item.pick(), {silent: true}) new_item.boosts 'post' - new_item.supply_default(templates) + new_item.supply_default() # prepare balloon balloon = new Pettanr.Balloon() - balloon.set(balloon.pick(templates), {silent: true}) + balloon.templates = templates + balloon.set(balloon.pick(), {silent: true}) balloon.boosts 'post' - balloon.supply_default(templates) + balloon.supply_default() # prepare speech speech = new Pettanr.Speech() - speech.set(speech.pick(templates), {silent: true}) + speech.templates = templates + speech.set(speech.pick(), {silent: true}) speech.boosts 'post' - speech.supply_default(templates) + speech.supply_default() # join elements new_item.set({balloon: balloon, speech: speech}, {silent: true}) @trigger('ready', new_item) + ) ready: (new_item) -> @dialog().stop() diff --git a/app/assets/stylesheets/test.css.scss b/app/assets/stylesheets/test.css.scss index 994c976c..3a7303af 100644 --- a/app/assets/stylesheets/test.css.scss +++ b/app/assets/stylesheets/test.css.scss @@ -392,6 +392,7 @@ ul.scenarios_elements { .filer-body { padding-left: 0; + list-style-type: none; } .filer-item { clear: both; -- 2.11.0