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.84, fix for :contains() & :lang().
[pettanr/clientJs.git]
/
0.6.x
/
js
/
01_dom
/
20_XDomImage.js
diff --git
a/0.6.x/js/01_dom/20_XDomImage.js
b/0.6.x/js/01_dom/20_XDomImage.js
index
f7823c1
..
e5769b8
100644
(file)
--- a/
0.6.x/js/01_dom/20_XDomImage.js
+++ b/
0.6.x/js/01_dom/20_XDomImage.js
@@
-23,15
+23,19
@@
X.Dom.Image = {
}
\r
);
\r
Node._body._startUpdate();
\r
}
\r
);
\r
Node._body._startUpdate();
\r
- img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._raw
Node
;
\r
+ img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._raw
Object
;
\r
remove = true;
\r
} else {
\r
if( XnodeOrImageElemOrSrc.constructor === X.Dom.Node ){
\r
xnode = XnodeOrImageElemOrSrc;
\r
remove = true;
\r
} else {
\r
if( XnodeOrImageElemOrSrc.constructor === X.Dom.Node ){
\r
xnode = XnodeOrImageElemOrSrc;
\r
- img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._raw
Node
;
\r
+ img = xnode._ie4getRawNode ? xnode._ie4getRawNode() : xnode._raw
Object
;
\r
} else
\r
if( X.Type.isHTMLElement( XnodeOrImageElemOrSrc ) ){
\r
img = XnodeOrImageElemOrSrc;
\r
} else
\r
if( X.Type.isHTMLElement( XnodeOrImageElemOrSrc ) ){
\r
img = XnodeOrImageElemOrSrc;
\r
+ } else
\r
+ if( XnodeOrImageElemOrSrc.constructor === X.EventDispatcher && X.Type.isImage( XnodeOrImageElemOrSrc._rawObject ) ){
\r
+ xnode = XnodeOrImageElemOrSrc;
\r
+ img = xnode._rawObject;
\r
} else {
\r
return;
\r
};
\r
} else {
\r
return;
\r
};
\r
@@
-100,19
+104,20
@@
X.Dom.Image = {
abspath : null,
\r
delay : null,
\r
timeout : 0,
\r
abspath : null,
\r
delay : null,
\r
timeout : 0,
\r
+
\r
Constructor : function( abspath, delay, timeout ){
\r
var img;
\r
Constructor : function( abspath, delay, timeout ){
\r
var img;
\r
-
\r
+
\r
this.abspath = abspath;
\r
this.delay = delay || 100;
\r
this.timeout = timeout || 10000;
\r
this.xnode =
\r
(
\r
window[ 'Image' ] ?
\r
this.abspath = abspath;
\r
this.delay = delay || 100;
\r
this.timeout = timeout || 10000;
\r
this.xnode =
\r
(
\r
window[ 'Image' ] ?
\r
- X.
Dom.Node
( img = new Image() ) :
\r
+ X.
EventDispatcher
( img = new Image() ) :
\r
X.Dom.Node._systemNode.create( 'img', { src : abspath } )
\r
)
\r
X.Dom.Node._systemNode.create( 'img', { src : abspath } )
\r
)
\r
- .listen( [ 'load', 'error', 'abort', X.Event.SUCCESS, X.Event.ERROR ], this );
\r
+ .listen( [ 'load', 'error', 'abort', X.Event.SUCCESS, X.Event.ERROR
, X.Event.KILL_INSTANCE
], this );
\r
img && ( img.src = abspath );
\r
this._detect();
\r
},
\r
img && ( img.src = abspath );
\r
this._detect();
\r
},
\r
@@
-130,11
+135,11
@@
X.Dom.Image = {
// if( timer ) return; // これがあると safari3.2 で駄目、、、
\r
this.finish = true;
\r
this.timerID && X.Timer.remove( this.timerID );
\r
// if( timer ) return; // これがあると safari3.2 で駄目、、、
\r
this.finish = true;
\r
this.timerID && X.Timer.remove( this.timerID );
\r
- if( window.opera && !this.xnode._raw
Node
.complete ){
\r
+ if( window.opera && !this.xnode._raw
Object
.complete ){
\r
this.timerID = this.asyncDispatch( 0, { type : X.Event.ERROR } );
\r
return;
\r
};
\r
this.timerID = this.asyncDispatch( 0, { type : X.Event.ERROR } );
\r
return;
\r
};
\r
- size = X.Dom.Image.getActualDimension( X.UA.IE
&& X.UA.IE < 9 && window.Image
? this.abspath : this.xnode );
\r
+ size = X.Dom.Image.getActualDimension( X.UA.IE
< 9
? this.abspath : this.xnode );
\r
this.timerID = this.asyncDispatch( 0, {
\r
type : X.Event.SUCCESS,
\r
src : this.abspath,
\r
this.timerID = this.asyncDispatch( 0, {
\r
type : X.Event.SUCCESS,
\r
src : this.abspath,
\r
@@
-147,13
+152,18
@@
X.Dom.Image = {
delete this.timerID;
\r
X.Timer.once( 0, this, this.kill );
\r
break;
\r
delete this.timerID;
\r
X.Timer.once( 0, this, this.kill );
\r
break;
\r
+ case X.Event.KILL_INSTANCE :
\r
+ this.timerID && X.Timer.remove( this.timerID );
\r
+ this.xnode.destroy && this.xnode.destroy();
\r
+ this.unlisten();
\r
+ break;
\r
};
\r
},
\r
_detect : function(){
\r
if( this.finish === true ) return;
\r
};
\r
},
\r
_detect : function(){
\r
if( this.finish === true ) return;
\r
- if( this.xnode._raw
Node && this.xnode._rawNode
.complete ){
\r
+ if( this.xnode._raw
Object && this.xnode._rawObject
.complete ){
\r
this.finish = true;
\r
this.finish = true;
\r
- if( this.xnode._raw
Node
.width ) return;
\r
+ if( this.xnode._raw
Object
.width ) return;
\r
this.timerID = this.asyncDispatch( 0, { type : X.Event.ERROR } );
\r
return;
\r
};
\r
this.timerID = this.asyncDispatch( 0, { type : X.Event.ERROR } );
\r
return;
\r
};
\r
@@
-169,11
+179,6
@@
X.Dom.Image = {
\r
// this.dispacth( { type : X.Event.CANCELED } );
\r
this.kill();
\r
\r
// this.dispacth( { type : X.Event.CANCELED } );
\r
this.kill();
\r
- },
\r
- onKill : function(){
\r
- this.timerID && X.Timer.remove( this.timerID );
\r
- this.xnode.destroy();
\r
- this.unlisten();
\r
}
\r
}
\r
)
\r
}
\r
}
\r
)
\r