OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.6.207, Modification of variable scope leaks.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
02_dom
/
10_XNodeAnime.js
diff --git
a/0.6.x/js/02_dom/10_XNodeAnime.js
b/0.6.x/js/02_dom/10_XNodeAnime.js
index
e856bd8
..
580d6da
100644
(file)
--- a/
0.6.x/js/02_dom/10_XNodeAnime.js
+++ b/
0.6.x/js/02_dom/10_XNodeAnime.js
@@
-146,7
+146,7
@@
function X_Node_animate( obj ){
obj.altY = fallback & 16 ? 'bottom' : 'top';
\r
\r
// scale
\r
obj.altY = fallback & 16 ? 'bottom' : 'top';
\r
\r
// scale
\r
- if( obj.toScaleX !== 1
&& obj.fromScaleX !== 1 && obj.toScaleY !== 1 &&
obj.fromScaleY !== 1 ){
\r
+ if( obj.toScaleX !== 1
|| obj.fromScaleX !== 1 || obj.toScaleY !== 1 ||
obj.fromScaleY !== 1 ){
\r
sameRate = obj.fromScaleX === obj.fromScaleY && obj.toScaleX === obj.toScaleY;
\r
\r
if( X_NodeAnime_hasTransform ){
\r
sameRate = obj.fromScaleX === obj.fromScaleY && obj.toScaleX === obj.toScaleY;
\r
\r
if( X_NodeAnime_hasTransform ){
\r
@@
-315,7
+315,7
@@
function X_NodeAnime_stopNow( xnode ){
*/
\r
function X_NodeAnime_detectWaitAnimation( xnode, duration, isTest ){
\r
var list = X_NodeAnime_QUEUE,
\r
*/
\r
function X_NodeAnime_detectWaitAnimation( xnode, duration, isTest ){
\r
var list = X_NodeAnime_QUEUE,
\r
- i = 0, _xnode;
\r
+ i = 0, _xnode
, obj
;
\r
\r
for( ; _xnode = list[ i ]; ++i ){
\r
if( _xnode === xnode ) break;
\r
\r
for( ; _xnode = list[ i ]; ++i ){
\r
if( _xnode === xnode ) break;
\r