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.133, fix for closure compiler - ADVANCED_OPTIMIZATIONS
[pettanr/clientJs.git]
/
0.6.x
/
js
/
20_ui
/
08_Box.js
diff --git
a/0.6.x/js/20_ui/08_Box.js
b/0.6.x/js/20_ui/08_Box.js
index
c1a3cbe
..
9434254
100644
(file)
--- a/
0.6.x/js/20_ui/08_Box.js
+++ b/
0.6.x/js/20_ui/08_Box.js
@@
-90,10
+90,13
@@
X.UI._Box = X.UI._AbstractUINode.inherits(
//throw new Error( 'インスタンスはすでに親に追加されています ' + arg );
\r
};
\r
} else
\r
//throw new Error( 'インスタンスはすでに親に追加されています ' + arg );
\r
};
\r
} else
\r
+ if( arg.instanceOf && arg.instanceOf( Node ) ){
\r
+ //this.layout = arg;
\r
+ } else
\r
if( arg.instanceOf && arg.instanceOf( X.UI.Layout.Base ) ){
\r
//this.layout = arg;
\r
} else
\r
if( arg.instanceOf && arg.instanceOf( X.UI.Layout.Base ) ){
\r
//this.layout = arg;
\r
} else
\r
- if( X
.Type.
isObject( arg ) ){
\r
+ if( X
_Type_
isObject( arg ) ){
\r
if( attrs ){
\r
attrs = X_Class_override( attrs, arg );
\r
} else {
\r
if( attrs ){
\r
attrs = X_Class_override( attrs, arg );
\r
} else {
\r
@@
-244,7
+247,7
@@
X.UI._Box = X.UI._AbstractUINode.inherits(
removeAt : function( from, length ){
\r
var uinodes = this.uinodes,
\r
i = uinodes.length,
\r
removeAt : function( from, length ){
\r
var uinodes = this.uinodes,
\r
i = uinodes.length,
\r
- to = from + ( X
.Type.
isNumber( length ) && 1 <= length ? length : 1 ),
\r
+ to = from + ( X
_Type_
isNumber( length ) && 1 <= length ? length : 1 ),
\r
node;
\r
for( ; i; ){
\r
node = uinodes[ --i ];
\r
node;
\r
for( ; i; ){
\r
node = uinodes[ --i ];
\r
@@
-357,14
+360,14
@@
X.UI.Box.presets = function(){
privateKlass = arg;
\r
layout = privateKlass.prototype.layout;
\r
} else
\r
privateKlass = arg;
\r
layout = privateKlass.prototype.layout;
\r
} else
\r
- if( X
.Type.
isObject( arg ) ){
\r
+ if( X
_Type_
isObject( arg ) ){
\r
if( attrs ){
\r
X_Class_override( attrs, arg, true );
\r
} else {
\r
attrs = arg;
\r
};
\r
} else
\r
if( attrs ){
\r
X_Class_override( attrs, arg, true );
\r
} else {
\r
attrs = arg;
\r
};
\r
} else
\r
- if( X
.Type.
isString( arg ) ){
\r
+ if( X
_Type_
isString( arg ) ){
\r
boxName = arg;
\r
};
\r
};
\r
boxName = arg;
\r
};
\r
};
\r