From d36edcdd63570a8dd64f9341ddb2081fbfd21d5d Mon Sep 17 00:00:00 2001
From: yasushiito <yas@pen-chan.jp>
Date: Wed, 29 Apr 2015 07:28:28 +0900
Subject: [PATCH] fix:balloon edit

---
 app/assets/javascripts/models/resource_picture.js.coffee | 6 ++++--
 app/assets/javascripts/pettanr/pettan_imager.js.coffee   | 4 ++--
 app/assets/javascripts/views/balloons/element.js.coffee  | 7 +++----
 app/controllers/panels_controller.rb                     | 1 -
 app/models/resource_picture.rb                           | 9 +++++++++
 lib/manifest/manifest.rb                                 | 2 ++
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/models/resource_picture.js.coffee b/app/assets/javascripts/models/resource_picture.js.coffee
index 1b5de0ee..f54e87cb 100644
--- a/app/assets/javascripts/models/resource_picture.js.coffee
+++ b/app/assets/javascripts/models/resource_picture.js.coffee
@@ -30,14 +30,16 @@ class Pettanr.ResourcePicture extends Peta.Content
     'image/' + @get('ext')
   
   r_url: (subdir = null) ->
-    opt = if Pettanr.to_s(@subdir).empty
+    opt = if _.isEmpty(subdir)
       ''
     else
       '?subdir=' + Pettanr.to_s(subdir)
     '/resource_pictures/' + @filename() + opt
   
   tmb_opt_img_tag: () ->
-    new Pettanr.Image.SymbolPicture({
+    klass = if true # thumbnail
+      Pettanr.Image.SymbolPicture
+    new klass({
       attr: {
         src: @r_url()
       },
diff --git a/app/assets/javascripts/pettanr/pettan_imager.js.coffee b/app/assets/javascripts/pettanr/pettan_imager.js.coffee
index 8eacb894..bb4d938a 100644
--- a/app/assets/javascripts/pettanr/pettan_imager.js.coffee
+++ b/app/assets/javascripts/pettanr/pettan_imager.js.coffee
@@ -14,8 +14,8 @@ class Pettanr.Imager
     else
       100
     r = if wr < hr
-      [w*wr/100, h*wr/100]
+      [Math.floor(w*wr/100), Math.floor(h*wr/100)]
     else
-      [w*hr/100, h*hr/100]
+      [Math.floor(w*hr/100), Math.floor(h*hr/100)]
     r
   
diff --git a/app/assets/javascripts/views/balloons/element.js.coffee b/app/assets/javascripts/views/balloons/element.js.coffee
index 89cc58dc..ce492b7b 100644
--- a/app/assets/javascripts/views/balloons/element.js.coffee
+++ b/app/assets/javascripts/views/balloons/element.js.coffee
@@ -57,7 +57,7 @@ class Pettanr.Views.Balloon.Element.Edit extends Pettanr.Views.Balloon.Element
         
         resize_div.css('top', '0px')
         resize_div.css('left', '0px')
-        resize_div.css('z-index', 1)
+        # resize_div.css('z-index', 1)
         width = ui.size.width
         height = ui.size.height
         top = speech_balloon_div.position().top
@@ -79,9 +79,6 @@ class Pettanr.Views.Balloon.Element.Edit extends Pettanr.Views.Balloon.Element
           height: height
         }, {silent: true})
         elm.trigger('resize')
-     resize: (event, ui) ->
-        resize_div = $(@)
-        speech_balloon_div = resize_div.parent()
       handles: 'all',
       autoHide: true
     }
@@ -89,6 +86,8 @@ class Pettanr.Views.Balloon.Element.Edit extends Pettanr.Views.Balloon.Element
   
   style: () ->
     {
+      top: '0px',
+      left: '0px',
       width: Pettanr.to_s(@element.get('width')) + 'px', 
       height: Pettanr.to_s(@element.get('height')) + 'px',
       'z-index': 1  # play case
diff --git a/app/controllers/panels_controller.rb b/app/controllers/panels_controller.rb
index 926acda9..ad67b3e5 100644
--- a/app/controllers/panels_controller.rb
+++ b/app/controllers/panels_controller.rb
@@ -142,7 +142,6 @@ class PanelsController < ApplicationController
         updated_html_format format
         updated_json_format format
       else
-    p @item.errors
         format.html {
           flash[:notice] = I18n.t('flash.notice.not_updated', :model => @my_model_class.model_name.human)
           @editor = Editor::PanelEditor.new @item, @operators
diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index 36d57e5d..7a081691 100644
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -230,4 +230,13 @@ class ResourcePicture < Peta::Content
     "#{self.license_group_module_name.tableize}/attributes/full_credit"
   end
   
+  def self.remake_all
+    ResourcePicture.find(:all).each do |resource_picture|
+      resource_picture.boosts 'post'
+      full = resource_picture.restore 'full'
+      imager = PettanImager.load full
+      resource_picture.store_picture_with_gif(imager)
+    end
+  end
+  
 end
diff --git a/lib/manifest/manifest.rb b/lib/manifest/manifest.rb
index bc561163..ce33eeae 100644
--- a/lib/manifest/manifest.rb
+++ b/lib/manifest/manifest.rb
@@ -32,6 +32,8 @@ module Manifest
     
     def init_after_load_manifest
       @system_resources.init
+      PettanImager.tmb_w = @magic_numbers['thumbnail_width']
+      PettanImager.tmb_h = @magic_numbers['thumbnail_height']
     end
     
     def replace_action_alias
-- 
2.11.0