OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fc32c9e
)
client is version 0.5.45, fixed real picture.
author
itozyun
<itozyun@user.sourceforge.jp>
Sun, 3 Feb 2013 12:47:43 +0000
(21:47 +0900)
committer
itozyun
<itozyun@user.sourceforge.jp>
Sun, 3 Feb 2013 12:47:43 +0000
(21:47 +0900)
app/assets/javascripts/peta-common.js
patch
|
blob
|
history
diff --git
a/app/assets/javascripts/peta-common.js
b/app/assets/javascripts/peta-common.js
index
21b701b
..
ca18abd
100644
(file)
--- a/
app/assets/javascripts/peta-common.js
+++ b/
app/assets/javascripts/peta-common.js
@@
-1,6
+1,6
@@
/*
\r
* pettanR peta.common.js
\r
/*
\r
* pettanR peta.common.js
\r
- * version 0.5.4
4
\r
+ * version 0.5.4
5
\r
*
\r
* author:
\r
* itozyun
\r
*
\r
* author:
\r
* itozyun
\r
@@
-96,7
+96,7
@@
pettanr.CONST = ( function(){
NS_PETTANR_COMIC : 'pettanr-comic',
\r
THUMBNAIL_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/thumbnail\/' : PETTANR_ROOT_PATH + 'resource_pictures\/',
\r
RESOURCE_PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/' : PETTANR_ROOT_PATH + 'resource_pictures\/full\/',
\r
NS_PETTANR_COMIC : 'pettanr-comic',
\r
THUMBNAIL_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/thumbnail\/' : PETTANR_ROOT_PATH + 'resource_pictures\/',
\r
RESOURCE_PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_pictures\/' : PETTANR_ROOT_PATH + 'resource_pictures\/full\/',
\r
- P
ANEL_PICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + 'resource_
pictures\/' : PETTANR_ROOT_PATH + 'pictures\/',
\r
+ P
ICTURE_PATH : SERVER_SUPPORT === false ? RELATIVE + '
pictures\/' : PETTANR_ROOT_PATH + 'pictures\/',
\r
SYSTEM_PICTURE_PATH : ( SERVER_SUPPORT === false ? RELATIVE : PETTANR_ROOT_PATH ) + 'system_pictures\/',
\r
CREATE_COMIC_JS : SERVER_SUPPORT === false ? 'js\/create_new_comic.js' : PETTANR_ROOT_PATH + 'comics\/new.js',
\r
CREATE_PANEL_JS : SERVER_SUPPORT === false ? 'js\/create_new_panel.js' : PETTANR_ROOT_PATH + 'panels\/new.js',
\r
SYSTEM_PICTURE_PATH : ( SERVER_SUPPORT === false ? RELATIVE : PETTANR_ROOT_PATH ) + 'system_pictures\/',
\r
CREATE_COMIC_JS : SERVER_SUPPORT === false ? 'js\/create_new_comic.js' : PETTANR_ROOT_PATH + 'comics\/new.js',
\r
CREATE_PANEL_JS : SERVER_SUPPORT === false ? 'js\/create_new_panel.js' : PETTANR_ROOT_PATH + 'panels\/new.js',
\r
@@
-629,7
+629,7
@@
pettanr.image = ( function(){
pettanr.bind = ( function(){
\r
var BIND_WORKER_ARRAY = [],
\r
NAMESPACE_CLASSNAME = pettanr.CONST.NS_PETTANR_COMIC + '-',
\r
pettanr.bind = ( function(){
\r
var BIND_WORKER_ARRAY = [],
\r
NAMESPACE_CLASSNAME = pettanr.CONST.NS_PETTANR_COMIC + '-',
\r
- PICTURE_PATH = pettanr.CONST.P
ANEL_P
ICTURE_PATH,
\r
+ PICTURE_PATH = pettanr.CONST.PICTURE_PATH,
\r
ELM_DETECT_WIDTH = ( function(){
\r
var ret = document.createElement( 'div' );
\r
ret.style.cssText = 'width: auto;height: 0;padding: 0;margin: 0;display: block;visibility: hidden;float: none;position: static;';
\r
ELM_DETECT_WIDTH = ( function(){
\r
var ret = document.createElement( 'div' );
\r
ret.style.cssText = 'width: auto;height: 0;padding: 0;margin: 0;display: block;visibility: hidden;float: none;position: static;';
\r
@@
-738,7
+738,7
@@
pettanr.bind = ( function(){
},
\r
cssText = [],
\r
elements = json.elements,
\r
},
\r
cssText = [],
\r
elements = json.elements,
\r
- rPic,
\r
+ r
eal
Pic,
\r
p, i, l;
\r
this.elmTarget.appendChild( elmPanel );
\r
\r
p, i, l;
\r
this.elmTarget.appendChild( elmPanel );
\r
\r
@@
-754,19
+754,18
@@
pettanr.bind = ( function(){
\r
if( !elements ) return;
\r
for( i = 0, l = elements.length; i < l; ++i ){
\r
\r
if( !elements ) return;
\r
for( i = 0, l = elements.length; i < l; ++i ){
\r
- data = elements[ i ];
\r
- rPic = data.picture;
\r
- if( rPic ){
\r
- this.buildImage( elmPanel, data, rPic );
\r
+ data
= elements[ i ];
\r
+ r
eal
Pic = data.picture;
\r
+ if( r
eal
Pic ){
\r
+ this.buildImage( elmPanel, data, r
eal
Pic );
\r
} else {
\r
this.buildBalloon( elmPanel, data );
\r
};
\r
};
\r
},
\r
} else {
\r
this.buildBalloon( elmPanel, data );
\r
};
\r
};
\r
},
\r
- buildImage : function( elmPanel, data, rPic ){
\r
- var oPic = rPic.original_picture,
\r
- rImg = pettanr.image.createReversibleImage(
\r
- [ PICTURE_PATH, oPic.id, '.', oPic.ext ].join( '' ),
\r
+ buildImage : function( elmPanel, data, realPic ){
\r
+ var rImg = pettanr.image.createReversibleImage(
\r
+ [ PICTURE_PATH, realPic.id, '.', realPic.ext ].join( '' ),
\r
data.width, data.height
\r
),
\r
elmImg = rImg.elm;
\r
data.width, data.height
\r
),
\r
elmImg = rImg.elm;
\r