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.121, iScroll5 is working on iPhone touch 1G, update X.Audio.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
01_core
/
04_XObject.js
diff --git
a/0.6.x/js/01_core/04_XObject.js
b/0.6.x/js/01_core/04_XObject.js
index
be7f595
..
e9d96df
100644
(file)
--- a/
0.6.x/js/01_core/04_XObject.js
+++ b/
0.6.x/js/01_core/04_XObject.js
@@
-31,6
+31,7
@@
function X_Object_clone( src ){
if( typeof src !== 'object' ) return src;
\r
ret = {};
\r
for( k in src ){
\r
if( typeof src !== 'object' ) return src;
\r
ret = {};
\r
for( k in src ){
\r
+ //if( X_EMPTY_OBJECT[ k ] ) continue;
\r
ret[ k ] = src[ k ];
\r
};
\r
return ret;
\r
ret[ k ] = src[ k ];
\r
};
\r
return ret;
\r
@@
-40,6
+41,7
@@
function X_Object_override( target, src ){
var k;
\r
if( !X.Type.isObject( src ) ) return target;
\r
for( k in src ){
\r
var k;
\r
if( !X.Type.isObject( src ) ) return target;
\r
for( k in src ){
\r
+ //if( X_EMPTY_OBJECT[ k ] ) continue;
\r
target[ k ] = src[ k ];
\r
};
\r
return target;
\r
target[ k ] = src[ k ];
\r
};
\r
return target;
\r
@@
-50,7
+52,7
@@
function X_Object_deepCopy( src ){
};
\r
\r
function X_Object_deepCopy_( src, objSrc, objCopy, n ) {
\r
};
\r
\r
function X_Object_deepCopy_( src, objSrc, objCopy, n ) {
\r
- var ret, i, k
ey
;
\r
+ var ret, i, k;
\r
if( !src ){ // 0, "", null, undefined, NaN, false
\r
return src;
\r
} else
\r
if( !src ){ // 0, "", null, undefined, NaN, false
\r
return src;
\r
} else
\r
@@
-69,8
+71,9
@@
function X_Object_deepCopy_( src, objSrc, objCopy, n ) {
// string, number, true
\r
return src;
\r
};
\r
// string, number, true
\r
return src;
\r
};
\r
- for( key in src ){
\r
- ret[ key ] = clone( src[ key ], objSrc, objCopy, n );
\r
+ for( k in src ){
\r
+ //if( X_EMPTY_OBJECT[ k ] ) continue;
\r
+ ret[ k ] = clone( src[ k ], objSrc, objCopy, n );
\r
};
\r
return ret;
\r
};
\r
};
\r
return ret;
\r
};
\r
@@
-86,8
+89,9
@@
function X_Object_cloneArray( ary ){
};
\r
\r
function X_Object_isEmpty( v ){
\r
};
\r
\r
function X_Object_isEmpty( v ){
\r
- var p;
\r
- for( p in v ){
\r
+ var k;
\r
+ for( k in v ){
\r
+ //if( X_EMPTY_OBJECT[ k ] ) continue;
\r
return false;//if( v.hasOwnProperty && v.hasOwnProperty( p ) ) return false; ie4 で動かない、、、
\r
};
\r
return true;
\r
return false;//if( v.hasOwnProperty && v.hasOwnProperty( p ) ) return false; ie4 で動かない、、、
\r
};
\r
return true;
\r