OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
604668b
)
Fix the bug of X.NodeAnime.
master
author
itozyun
<itozyun@user.sourceforge.jp>
Fri, 23 Dec 2016 11:57:18 +0000
(20:57 +0900)
committer
itozyun
<itozyun@user.sourceforge.jp>
Fri, 23 Dec 2016 11:57:18 +0000
(20:57 +0900)
0.6.x/js/02_dom/10_XNodeAnime.js
patch
|
blob
|
history
diff --git
a/0.6.x/js/02_dom/10_XNodeAnime.js
b/0.6.x/js/02_dom/10_XNodeAnime.js
index
c851f8e
..
9de186d
100644
(file)
--- a/
0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/
0.6.x/js/02_dom/10_XNodeAnime.js
@@
-525,7
+525,7
@@
function X_NodeAnime_updatePosition( xnode, obj, ratio, useGPU ){
\r
//console.log( 'updatePosition x:' + x + ' gpu:' + !!useGPU );
\r
if( obj.transform ){
\r
\r
//console.log( 'updatePosition x:' + x + ' gpu:' + !!useGPU );
\r
if( obj.transform ){
\r
- if( ( x === x || y === y ) && ( x !== 0
&&
y !== 0 ) ){
\r
+ if( ( x === x || y === y ) && ( x !== 0
||
y !== 0 ) ){
\r
if( X_UA[ 'Safari' ] && X_UA[ 'Windows' ] ){
\r
// http://shinimae.hatenablog.com/entry/2016/01/13/151748
\r
str = ' -webkit-translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)';
\r
if( X_UA[ 'Safari' ] && X_UA[ 'Windows' ] ){
\r
// http://shinimae.hatenablog.com/entry/2016/01/13/151748
\r
str = ' -webkit-translate(' + ( x | 0 ) + 'px,' + ( y | 0 ) + 'px)';
\r
@@
-538,7
+538,9
@@
function X_NodeAnime_updatePosition( xnode, obj, ratio, useGPU ){
if( skewY < 0 || 0 < skewY ) str += ' skewY(' + skewY + 'deg)';
\r
if( scaleX < 1 || 1 < scaleX ) str += ' scaleX(' + scaleX + ')';
\r
if( scaleY < 1 || 1 < scaleY ) str += ' scaleY(' + scaleY + ')';
\r
if( skewY < 0 || 0 < skewY ) str += ' skewY(' + skewY + 'deg)';
\r
if( scaleX < 1 || 1 < scaleX ) str += ' scaleX(' + scaleX + ')';
\r
if( scaleY < 1 || 1 < scaleY ) str += ' scaleY(' + scaleY + ')';
\r
+
\r
xnode[ 'css' ]( 'transform', ( str ? str.substr( 1 ) : '' ) + ( useGPU ? X_NodeAnime_translateZ : '' ) );
\r
xnode[ 'css' ]( 'transform', ( str ? str.substr( 1 ) : '' ) + ( useGPU ? X_NodeAnime_translateZ : '' ) );
\r
+ console.log( xnode.className() + ' ' + str + ' ' + (xnode[ '_flags' ] & X_NodeFlags_DIRTY_CSS) );
\r
\r
if( X_NodeAnime_translateZ ){
\r
if( useGPU ){
\r
\r
if( X_NodeAnime_translateZ ){
\r
if( useGPU ){
\r