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.96. add lock function @X.EventDispatcher.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
02_dom
/
06_XDomStyle.js
diff --git
a/0.6.x/js/02_dom/06_XDomStyle.js
b/0.6.x/js/02_dom/06_XDomStyle.js
index
bae6a2d
..
112caf2
100644
(file)
--- a/
0.6.x/js/02_dom/06_XDomStyle.js
+++ b/
0.6.x/js/02_dom/06_XDomStyle.js
@@
-986,16
+986,16
@@
X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
ieFix = X.Dom.Style.IE_FILTER_FIX;
for( p in nameOrObj ){
if( ieFix[ p ] ){
ieFix = X.Dom.Style.IE_FILTER_FIX;
for( p in nameOrObj ){
if( ieFix[ p ] ){
- this._dirty |= X
.Dom.
Dirty.IE_FILTER;
+ this._dirty |= X
_Node_
Dirty.IE_FILTER;
};
v = nameOrObj[ p ];
v || v === 0 ? css[ camelize( p ) ] = v : delete css[ camelize( p ) ];
if( p === 'display' ){
};
v = nameOrObj[ p ];
v || v === 0 ? css[ camelize( p ) ] = v : delete css[ camelize( p ) ];
if( p === 'display' ){
- v === 'none' ? ( this._state |= X
.Dom.State.IE5_DISPLAY_NONE_FIX ) : ( this._state &= ~X.Dom.
State.IE5_DISPLAY_NONE_FIX );
- v === 'none' ? ( this._state |= X
.Dom.State.DISPLAY_NONE ) : ( this._state &= ~X.Dom.
State.DISPLAY_NONE );
+ v === 'none' ? ( this._state |= X
_Node_State.IE5_DISPLAY_NONE_FIX ) : ( this._state &= ~X_Node_
State.IE5_DISPLAY_NONE_FIX );
+ v === 'none' ? ( this._state |= X
_Node_State.DISPLAY_NONE ) : ( this._state &= ~X_Node_
State.DISPLAY_NONE );
};
};
};
};
- this._dirty |= X
.Dom.
Dirty.CSS;
+ this._dirty |= X
_Node_
Dirty.CSS;
this.parent && this._reserveUpdate();
delete this._cssText;
return this;
this.parent && this._reserveUpdate();
delete this._cssText;
return this;
@@
-1008,7
+1008,7
@@
X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
v = args[ 1 ];
if( css[ name ] === v ) return this;
if( X.Dom.Style.IE_FILTER_FIX[ name ] ){
v = args[ 1 ];
if( css[ name ] === v ) return this;
if( X.Dom.Style.IE_FILTER_FIX[ name ] ){
- this._dirty |= X
.Dom.
Dirty.IE_FILTER;
+ this._dirty |= X
_Node_
Dirty.IE_FILTER;
};
if( !v && v !== 0 ){
delete css[ name ];
};
if( !v && v !== 0 ){
delete css[ name ];
@@
-1016,10
+1016,10
@@
X.Dom.Node.prototype.css = function( nameOrObj /* orUnitID, valuOrUnitOrName */
css[ name ] = v;
};
delete this._cssText;
css[ name ] = v;
};
delete this._cssText;
- this._dirty |= X
.Dom.
Dirty.CSS;
+ this._dirty |= X
_Node_
Dirty.CSS;
if( name === 'display' ){
if( name === 'display' ){
- v === 'none' ? ( this._state |= X
.Dom.State.IE5_DISPLAY_NONE_FIX ) : ( this._state &= ~X.Dom.
State.IE5_DISPLAY_NONE_FIX );
- v === 'none' ? ( this._state |= X
.Dom.State.DISPLAY_NONE ) : ( this._state &= ~X.Dom.
State.DISPLAY_NONE );
+ v === 'none' ? ( this._state |= X
_Node_State.IE5_DISPLAY_NONE_FIX ) : ( this._state &= ~X_Node_
State.IE5_DISPLAY_NONE_FIX );
+ v === 'none' ? ( this._state |= X
_Node_State.DISPLAY_NONE ) : ( this._state &= ~X_Node_
State.DISPLAY_NONE );
};
// parent でなく this._root! でなくて this._state & in tree
this.parent && this._reserveUpdate();
};
// parent でなく this._root! でなくて this._state & in tree
this.parent && this._reserveUpdate();
@@
-1045,15
+1045,15
@@
X.Dom.Node.prototype.cssText = function( v ){
var obj, i, l, attr, name;
if( v === '' ){
delete this._css;
var obj, i, l, attr, name;
if( v === '' ){
delete this._css;
- this._state &= ~X
.Dom.
State.IE5_DISPLAY_NONE_FIX;
- this._dirty |= X
.Dom.
Dirty.CSS;
+ this._state &= ~X
_Node_
State.IE5_DISPLAY_NONE_FIX;
+ this._dirty |= X
_Node_
Dirty.CSS;
this.parent && this._reserveUpdate();
delete this._cssText;
return this;
} else
if( X.Type.isString( v ) ){
delete this._css;
this.parent && this._reserveUpdate();
delete this._cssText;
return this;
} else
if( X.Type.isString( v ) ){
delete this._css;
- this._state &= ~X
.Dom.
State.IE5_DISPLAY_NONE_FIX;
+ this._state &= ~X
_Node_
State.IE5_DISPLAY_NONE_FIX;
obj = {};
v = v.split( ';' ); // TODO content ";" などにも対応
for( i = 0, l = v.length; i < l; ++i ){
obj = {};
v = v.split( ';' ); // TODO content ";" などにも対応
for( i = 0, l = v.length; i < l; ++i ){
@@
-1063,7
+1063,7
@@
X.Dom.Node.prototype.cssText = function( v ){
return this.css( obj );
};
// getter
return this.css( obj );
};
// getter
- if( this._dirty & X
.Dom.
Dirty.CSS && !( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){
+ if( this._dirty & X
_Node_
Dirty.CSS && !( this._cssText = X.Dom.Style.objToCssText( this._css ) ) ){
delete this._cssText;
};
return this._cssText;
delete this._cssText;
};
return this._cssText;
@@
-1072,14
+1072,14
@@
X.Dom.Node.prototype.cssText = function( v ){
/*
* ここでは HTMLElement のチ1ェックは行わない!
* TODO
/*
* ここでは HTMLElement のチ1ェックは行わない!
* TODO
- * body に css attr がセットされた場合には X
.Dom.
baseFontSize をクリア
+ * body に css attr がセットされた場合には X
_Dom_
baseFontSize をクリア
*/
X.Dom.Node.prototype._getCharSize =
window.getComputedStyle ?
(function(){
Node._body._updateTimerID && Node._body._startUpdate();
*/
X.Dom.Node.prototype._getCharSize =
window.getComputedStyle ?
(function(){
Node._body._updateTimerID && Node._body._startUpdate();
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
if( this._fontSize ) return this._fontSize;
return this._fontSize = parseFloat( getComputedStyle( this._rawObject, null ).fontSize );
}) :
if( this._fontSize ) return this._fontSize;
return this._fontSize = parseFloat( getComputedStyle( this._rawObject, null ).fontSize );
}) :
@@
-1087,7
+1087,7
@@
X.Dom.Node.prototype._getCharSize =
document.defaultView && document.defaultView.getComputedStyle ?
(function(){
Node._body._updateTimerID && Node._body._startUpdate();
document.defaultView && document.defaultView.getComputedStyle ?
(function(){
Node._body._updateTimerID && Node._body._startUpdate();
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
if( this._fontSize ) return this._fontSize;
return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawObject, null ).fontSize );
}) :
if( this._fontSize ) return this._fontSize;
return this._fontSize = parseFloat( document.defaultView.getComputedStyle( this._rawObject, null ).fontSize );
}) :
@@
-1104,7
+1104,7
@@
X.Dom.Node.prototype._getCharSize =
(function(){
var font, vu, v, u, _v;
Node._body._updateTimerID && Node._body._startUpdate();
(function(){
var font, vu, v, u, _v;
Node._body._updateTimerID && Node._body._startUpdate();
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
if( this._fontSize ) return this._fontSize;
font = this._rawObject.currentStyle.fontSize;
if( this._fontSize ) return this._fontSize;
font = this._rawObject.currentStyle.fontSize;
@@
-1131,11
+1131,11
@@
X.Dom.Node.prototype._getCharSize =
};
return 0;
}) :
};
return 0;
}) :
- X
.Dom.DOM_
W3C ?
+ X
_UA_DOM.
W3C ?
(function(){
var elm, v;
Node._body._updateTimerID && Node._body._startUpdate();
(function(){
var elm, v;
Node._body._updateTimerID && Node._body._startUpdate();
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
if( this._fontSize ) return this._fontSize;
this._rawObject.appendChild( elm = document.createElement( 'span' ) );
if( this._fontSize ) return this._fontSize;
this._rawObject.appendChild( elm = document.createElement( 'span' ) );
@@
-1145,11
+1145,11
@@
X.Dom.Node.prototype._getCharSize =
this._rawObject.removeChild( elm );
return this._fontSize = v;
}) :
this._rawObject.removeChild( elm );
return this._fontSize = v;
}) :
- X
.Dom.DOM_
IE4 ?
+ X
_UA_DOM.
IE4 ?
(function(){
var font, vu, v, u, _v;
Node._body._updateTimerID && Node._body._startUpdate();
(function(){
var font, vu, v, u, _v;
Node._body._updateTimerID && Node._body._startUpdate();
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
if( this._fontSize ) return this._fontSize;
if( this._css && ( font = this._css.fontSize ) ){
if( this._fontSize ) return this._fontSize;
if( this._css && ( font = this._css.fontSize ) ){
@@
-1182,7
+1182,7
@@
X.Dom.Node.prototype._getCharSize =
}) :
(function(){
var elm, v;
}) :
(function(){
var elm, v;
- if( this === Node._body && X
.Dom.baseFontSize ) return X.Dom.
baseFontSize;
+ if( this === Node._body && X
_Dom_baseFontSize ) return X_Dom_
baseFontSize;
Node._body._updateTimerID && Node._body._startUpdate();
if( this._fontSize ) return this._fontSize;
Node._body._updateTimerID && Node._body._startUpdate();
if( this._fontSize ) return this._fontSize;
@@
-1260,7
+1260,7
@@
X.Dom.Node.prototype._getCharSize =
};
} )();
};
} )();
-X.Dom.listenOnce( X
.Dom.Event.DOM
_INIT, function(){
+X.Dom.listenOnce( X
_TEMP.SYSTEM_EVENT
_INIT, function(){
var xnode = Node._systemNode,
output = X.Dom.Style._UNIT_RATIO = {},
list = 'cm,mm,in,pt,pc'.split( ',' ),
var xnode = Node._systemNode,
output = X.Dom.Style._UNIT_RATIO = {},
list = 'cm,mm,in,pt,pc'.split( ',' ),