From 9cca4674c4f2cdd5100618f8f12cad779832aaae Mon Sep 17 00:00:00 2001 From: yasushiito Date: Fri, 14 Aug 2015 08:35:57 +0900 Subject: [PATCH] fix:panel elm play --- Gemfile | 3 +-- app/assets/javascripts/pettanr/inspire.js.coffee | 2 +- app/assets/javascripts/views/balloons/show.js.coffee | 4 ++-- app/assets/javascripts/views/ground_colors/show.js.coffee | 4 ++-- app/assets/javascripts/views/ground_pictures/show.js.coffee | 4 ++-- app/assets/javascripts/views/panel_pictures/show.js.coffee | 2 +- app/assets/javascripts/views/scrolls/play.js.coffee | 2 +- app/assets/javascripts/views/speech_balloons/show.js.coffee | 4 ++-- app/assets/javascripts/views/speeches/show.js.coffee | 4 ++-- lib/s3_picture.rb | 2 +- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index f093162f..3e4e281b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,8 +13,6 @@ gem 'underscore-rails' gem 'rails-timeago' gem 'kaminari' gem 'sanitize' -#gem 'aws-s3' -#gem 'aws-s3', :git => 'https://github.com/bartoszkopinski/aws-s3' gem 'aws-sdk', '~> 2.0' gem 'awesome_nested_set', '~> 3.0' gem 'validates_existence' @@ -67,6 +65,7 @@ gem 'bcrypt-ruby', '~> 3.0.0' group :production do #gem 'pg' #gem 'therubyracer-heroku' + #gem 'rails_12factor' end group :mgk do diff --git a/app/assets/javascripts/pettanr/inspire.js.coffee b/app/assets/javascripts/pettanr/inspire.js.coffee index c40cd932..b706feb8 100644 --- a/app/assets/javascripts/pettanr/inspire.js.coffee +++ b/app/assets/javascripts/pettanr/inspire.js.coffee @@ -41,7 +41,7 @@ class Pettanr.Inspire delete attrs['id'] _.extend(attrs, @elements_save_data()) # save json data by panel form - new_panel = new Pettanr.Panel.WithElements() + new_panel = new Pettanr.Panel.Edit() new_form = Locmare.Form.factory({ form_name: new_panel.item_name(), use_name: 'default' diff --git a/app/assets/javascripts/views/balloons/show.js.coffee b/app/assets/javascripts/views/balloons/show.js.coffee index 65e39a73..a02f82c3 100644 --- a/app/assets/javascripts/views/balloons/show.js.coffee +++ b/app/assets/javascripts/views/balloons/show.js.coffee @@ -9,9 +9,9 @@ class Pettanr.Views.Balloon.Show extends Pettanr.View.Show success: (@speech_balloon) => @speech_balloon.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() @body = new Pettanr.Views.Panel.Body({ panel: @panel, diff --git a/app/assets/javascripts/views/ground_colors/show.js.coffee b/app/assets/javascripts/views/ground_colors/show.js.coffee index 79b28b6c..7e8b6b3f 100644 --- a/app/assets/javascripts/views/ground_colors/show.js.coffee +++ b/app/assets/javascripts/views/ground_colors/show.js.coffee @@ -7,9 +7,9 @@ class Pettanr.Views.GroundColor.Show extends Pettanr.View.Show this.$el.html('') @item.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() @body = new Pettanr.Views.Panel.Body({ panel: @panel, diff --git a/app/assets/javascripts/views/ground_pictures/show.js.coffee b/app/assets/javascripts/views/ground_pictures/show.js.coffee index 7c914492..4fad4614 100644 --- a/app/assets/javascripts/views/ground_pictures/show.js.coffee +++ b/app/assets/javascripts/views/ground_pictures/show.js.coffee @@ -7,9 +7,9 @@ class Pettanr.Views.GroundPicture.Show extends Pettanr.View.Show this.$el.html('') @item.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() @body = new Pettanr.Views.Panel.Body({ panel: @panel, diff --git a/app/assets/javascripts/views/panel_pictures/show.js.coffee b/app/assets/javascripts/views/panel_pictures/show.js.coffee index fd139381..f539a5d0 100644 --- a/app/assets/javascripts/views/panel_pictures/show.js.coffee +++ b/app/assets/javascripts/views/panel_pictures/show.js.coffee @@ -7,7 +7,7 @@ class Pettanr.Views.PanelPicture.Show extends Pettanr.View.Show this.$el.html('') @item.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() diff --git a/app/assets/javascripts/views/scrolls/play.js.coffee b/app/assets/javascripts/views/scrolls/play.js.coffee index 20b4f5d5..2eb032ab 100644 --- a/app/assets/javascripts/views/scrolls/play.js.coffee +++ b/app/assets/javascripts/views/scrolls/play.js.coffee @@ -153,7 +153,7 @@ class Pettanr.Views.Scroll.PlayModule.Panel extends Pettanr.View this.$el.html('') @panel = @panel.play() # retake panel for 'with_elements' mode @panel.fetch({cache: true}).done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() body = new Pettanr.Views.Scroll.PlayModule.PanelBody({ panel: @panel }) diff --git a/app/assets/javascripts/views/speech_balloons/show.js.coffee b/app/assets/javascripts/views/speech_balloons/show.js.coffee index 7cb05c27..5aa6147e 100644 --- a/app/assets/javascripts/views/speech_balloons/show.js.coffee +++ b/app/assets/javascripts/views/speech_balloons/show.js.coffee @@ -7,9 +7,9 @@ class Pettanr.Views.SpeechBalloon.Show extends Pettanr.View.Show this.$el.html('') @item.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() @body = new Pettanr.Views.Panel.Body({ panel: @panel, diff --git a/app/assets/javascripts/views/speeches/show.js.coffee b/app/assets/javascripts/views/speeches/show.js.coffee index 5e5ca4c5..7b6d5f98 100644 --- a/app/assets/javascripts/views/speeches/show.js.coffee +++ b/app/assets/javascripts/views/speeches/show.js.coffee @@ -9,9 +9,9 @@ class Pettanr.Views.Speech.Show extends Pettanr.View.Show success: (@speech_balloon) => @speech_balloon.get_parent('panel', this, { success: (item) => - @panel = item.with_elements() + @panel = item.play() @panel.fetch().done => - @panel.attributes = @panel.replaced_attributes() + @panel.attributes = @panel.decoded_attributes() @authored_by = @panel.authored_by() @body = new Pettanr.Views.Panel.Body({ panel: @panel, diff --git a/lib/s3_picture.rb b/lib/s3_picture.rb index 1f78e628..0b061579 100644 --- a/lib/s3_picture.rb +++ b/lib/s3_picture.rb @@ -43,7 +43,7 @@ class PictureIO else subdir.to_s + '/' end - sd + @base_dir + '/' + sd end def exist?(filename, subdir = nil) -- 2.11.0