From: itozyun Date: Sun, 3 Feb 2013 12:47:43 +0000 (+0900) Subject: client is version 0.5.45, fixed real picture. X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=2948a81d6d82184f15baf210ad961d4a1d974747 client is version 0.5.45, fixed real picture. --- diff --git a/app/assets/javascripts/peta-common.js b/app/assets/javascripts/peta-common.js index 21b701b9..ca18abd7 100644 --- a/app/assets/javascripts/peta-common.js +++ b/app/assets/javascripts/peta-common.js @@ -1,6 +1,6 @@ /* * pettanR peta.common.js - * version 0.5.44 + * version 0.5.45 * * author: * itozyun @@ -96,7 +96,7 @@ pettanr.CONST = ( function(){ NS_PETTANR_COMIC : 'pettanr-comic', THUMBNAIL_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/thumbnail\/' : PETTANR_ROOT_PATH + 'resource_pictures\/', RESOURCE_PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/' : PETTANR_ROOT_PATH + 'resource_pictures\/full\/', - PANEL_PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/' : PETTANR_ROOT_PATH + 'pictures\/', + PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'pictures\/' : PETTANR_ROOT_PATH + 'pictures\/', SYSTEM_PICTURE_PATH : ( SERVER_SUPPORT === false ? RELATIVE : PETTANR_ROOT_PATH ) + 'system_pictures\/', CREATE_COMIC_JS : SERVER_SUPPORT === false ? 'js\/create_new_comic.js' : PETTANR_ROOT_PATH + 'comics\/new.js', CREATE_PANEL_JS : SERVER_SUPPORT === false ? 'js\/create_new_panel.js' : PETTANR_ROOT_PATH + 'panels\/new.js', @@ -629,7 +629,7 @@ pettanr.image = ( function(){ pettanr.bind = ( function(){ var BIND_WORKER_ARRAY = [], NAMESPACE_CLASSNAME = pettanr.CONST.NS_PETTANR_COMIC + '-', - PICTURE_PATH = pettanr.CONST.PANEL_PICTURE_PATH, + PICTURE_PATH = pettanr.CONST.PICTURE_PATH, ELM_DETECT_WIDTH = ( function(){ var ret = document.createElement( 'div' ); ret.style.cssText = 'width: auto;height: 0;padding: 0;margin: 0;display: block;visibility: hidden;float: none;position: static;'; @@ -738,7 +738,7 @@ pettanr.bind = ( function(){ }, cssText = [], elements = json.elements, - rPic, + realPic, p, i, l; this.elmTarget.appendChild( elmPanel ); @@ -754,19 +754,18 @@ pettanr.bind = ( function(){ if( !elements ) return; for( i = 0, l = elements.length; i < l; ++i ){ - data = elements[ i ]; - rPic = data.picture; - if( rPic ){ - this.buildImage( elmPanel, data, rPic ); + data = elements[ i ]; + realPic = data.picture; + if( realPic ){ + this.buildImage( elmPanel, data, realPic ); } else { this.buildBalloon( elmPanel, data ); }; }; }, - buildImage : function( elmPanel, data, rPic ){ - var oPic = rPic.original_picture, - rImg = pettanr.image.createReversibleImage( - [ PICTURE_PATH, oPic.id, '.', oPic.ext ].join( '' ), + buildImage : function( elmPanel, data, realPic ){ + var rImg = pettanr.image.createReversibleImage( + [ PICTURE_PATH, realPic.id, '.', realPic.ext ].join( '' ), data.width, data.height ), elmImg = rImg.elm;