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.217, add #switch for X.Audio.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
01_core
/
21_XViewPort.js
diff --git
a/0.6.x/js/01_core/21_XViewPort.js
b/0.6.x/js/01_core/21_XViewPort.js
index
a89df05
..
86682a8
100644
(file)
--- a/
0.6.x/js/01_core/21_XViewPort.js
+++ b/
0.6.x/js/01_core/21_XViewPort.js
@@
-41,7
+41,7
@@
X_ViewPort = X_Class_override(
case 'beforeunload' :
// ie では a href='javascript' な要素でも beforeunload が起こる
href = e.target && e.target[ 'attr' ] && e.target[ 'attr' ]( 'href' );
case 'beforeunload' :
// ie では a href='javascript' な要素でも beforeunload が起こる
href = e.target && e.target[ 'attr' ] && e.target[ 'attr' ]( 'href' );
- if(
href && href.indexOf && href.indexOf( 'javascript:' ) === 0
) return X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;
+ if(
X_Type_isString( href ) && !href.toLowerCase().indexOf( 'javascript:' )
) return X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;
return X_ViewPort[ 'dispatch' ]( X_EVENT_BEFORE_UNLOAD );
return X_ViewPort[ 'dispatch' ]( X_EVENT_BEFORE_UNLOAD );
@@
-75,7
+75,8
@@
X_ViewPort = X_Class_override(
case 'blur' :
case 'focusout' :
case 'blur' :
case 'focusout' :
- if( 5 < X_UA[ 'IE' ] && X_UA[ 'IE' ] < 9 ){
+ // TODO ie5...
+ if( 5.5 < X_UA[ 'IE' ] && X_UA[ 'IE' ] < 9 ){
xnode = X_Node_getXNode( document.activeElement );
if( xnode ){
xnode[ 'listenOnce' ]( [ 'focus', 'blur' ], X_ViewPort_detectFocusForIE );
xnode = X_Node_getXNode( document.activeElement );
if( xnode ){
xnode[ 'listenOnce' ]( [ 'focus', 'blur' ], X_ViewPort_detectFocusForIE );
@@
-136,6
+137,7
@@
function X_ViewPort_changeFocus(){
};
};
+// TODO EventDispatcherProxy
/**
* window に相当する ViewPort 情報を提供するオブジェクト。
* @namespace X.ViewPort
/**
* window に相当する ViewPort 情報を提供するオブジェクト。
* @namespace X.ViewPort
@@
-268,6
+270,7
@@
X[ 'ViewPort' ] = {
// http://orera.g.hatena.ne.jp/edvakf/20100515/1273908051
//http://onozaty.hatenablog.com/entry/20060803/p1
// Safari2.0.4では標準・互換どちらも document.body
// http://orera.g.hatena.ne.jp/edvakf/20100515/1273908051
//http://onozaty.hatenablog.com/entry/20060803/p1
// Safari2.0.4では標準・互換どちらも document.body
+ // http://hisasann.com/housetect/2008/08/jqueryheightwidthopera95.html このdocument.body[ "client" + name ]はおそらくOpera9.5未満のバージョンで有効なんじゃないかな?
X_Node_updateTimerID && X_Node_startUpdate();
/*X_UA[ 'Opera' ] ?
X_Node_updateTimerID && X_Node_startUpdate();
/*X_UA[ 'Opera' ] ?
@@
-431,22
+434,22
@@
X[ 'ViewPort' ] = {
X_ViewPort_rootElement = document.compatMode !== 'CSS1Compat' ? X_elmBody : X_elmHtml || X_elmBody;
/**
X_ViewPort_rootElement = document.compatMode !== 'CSS1Compat' ? X_elmBody : X_elmHtml || X_elmBody;
/**
- * Node( documentElement )
+ *
X.
Node( documentElement )
* @alias X.Doc.html
* @type {Node}
*/
* @alias X.Doc.html
* @type {Node}
*/
- X[ 'Doc' ][ 'html' ] = html = X_Node_html = X_elmHtml && Node( X_elmHtml )[ 'removeClass' ]( 'js-disabled' )[ 'addClass' ]( X_UA_classNameForHTML );
+ X[ 'Doc' ][ 'html' ] = html = X_Node_html = X_elmHtml && Node( X_elmHtml )[ 'removeClass' ]( 'js-disabled' )[ 'addClass' ]( X_UA_classNameForHTML
.split( '.' ).join( '_' )
);
html[ '_flags' ] |= X_NodeFlags_IN_TREE;
/**
html[ '_flags' ] |= X_NodeFlags_IN_TREE;
/**
- * Node( head )
+ *
X.
Node( head )
* @alias X.Doc.head
* @type {Node}
*/
X[ 'Doc' ][ 'head' ] = head = X_Node_head = X_elmHead && Node( X_elmHead );
/**
* @alias X.Doc.head
* @type {Node}
*/
X[ 'Doc' ][ 'head' ] = head = X_Node_head = X_elmHead && Node( X_elmHead );
/**
- *
Node( documentElement
)
+ *
X.Node( body
)
* @alias X.Doc.body
* @type {Node}
*/
* @alias X.Doc.body
* @type {Node}
*/
@@
-464,7
+467,6
@@
X[ 'ViewPort' ] = {
X_ViewPort[ 'listenOnce' ]( X_EVENT_PRE_INIT, function(){
X_ViewPort_readyState = X_EVENT_XTREE_READY;
X_ViewPort[ 'listenOnce' ]( X_EVENT_PRE_INIT, function(){
X_ViewPort_readyState = X_EVENT_XTREE_READY;
- if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!X_elmBody.children.length;
!X_TEMP.X_Dom_useBuilder && X_ViewPort[ 'asyncDispatch' ]( X_EVENT_XTREE_READY );
} );
!X_TEMP.X_Dom_useBuilder && X_ViewPort[ 'asyncDispatch' ]( X_EVENT_XTREE_READY );
} );
@@
-511,11
+513,11
@@
X[ 'ViewPort' ] = {
//
if( X_ViewPort_orientationchange ){
//
if( X_ViewPort_orientationchange ){
- X_
EventDispatcher_systemListen( X_ViewPort,
'orientationchange', X_ViewPort_orientationchange );
+ X_
ViewPort[ 'listen' ](
'orientationchange', X_ViewPort_orientationchange );
};
if( X_ViewPort_detectFontSize ){
};
if( X_ViewPort_detectFontSize ){
- X_
EventDispatcher_systemListen( X_ViewPort,
'resize', X_ViewPort_resize );
+ X_
ViewPort[ 'listen' ](
'resize', X_ViewPort_resize );
X_Timer_add( 333, X_ViewPort_detectFontSize );
} else {
X_Timer_add( 333, X_ViewPort_resize );
X_Timer_add( 333, X_ViewPort_detectFontSize );
} else {
X_Timer_add( 333, X_ViewPort_resize );
@@
-526,39
+528,37
@@
X[ 'ViewPort' ] = {
X_ViewPort[ 'asyncDispatch' ]( X_ViewPort_readyState = X_EVENT_XDOM_READY );
} );
X_ViewPort[ 'asyncDispatch' ]( X_ViewPort_readyState = X_EVENT_XDOM_READY );
} );
- X_ViewPort[ 'asyncDispatch' ]( X_EVENT_PRE_INIT );
+ if( X_TEMP.X_Dom_useBuilder ) X_TEMP.X_Dom_useBuilder = !!X_elmBody.children.length;
+ X_ViewPort[ 'asyncDispatch' ]( X_EVENT_PRE_INIT );
+ X_ViewPort[ 'listen' ]( [ 'beforeunload', 'unload' ] );
- X_EventDispatcher_systemListen( X_ViewPort, [ 'beforeunload', 'unload' ] );
-
-//ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと
-//http://d.hatena.ne.jp/koumiya/20080916/1221580149
-
-console.log( '------------------->' );
+ //ブラウザの戻るボタンで戻ったときに呼ばれるイベントとかキャッシュとかそこらへんのこと
+ //http://d.hatena.ne.jp/koumiya/20080916/1221580149
if( document[ 'webkitHidden' ] !== undefined ){
if( document[ 'webkitHidden' ] !== undefined ){
- X_
EventDispatcher_systemListen( X_ViewPort_document,
'webkitvisibilitychange', X_ViewPort );
+ X_
ViewPort_document[ 'listen' ](
'webkitvisibilitychange', X_ViewPort );
} else
if( document[ 'hidden' ] !== undefined ){// iOS 7+
} else
if( document[ 'hidden' ] !== undefined ){// iOS 7+
- X_
EventDispatcher_systemListen( X_ViewPort_document,
'visibilitychange', X_ViewPort );
+ X_
ViewPort_document[ 'listen' ](
'visibilitychange', X_ViewPort );
} else
if( document[ 'msHidden' ] !== undefined ){
} else
if( document[ 'msHidden' ] !== undefined ){
- X_
EventDispatcher_systemListen( X_ViewPort_document,
'msvisibilitychange', X_ViewPort );
+ X_
ViewPort_document[ 'listen' ](
'msvisibilitychange', X_ViewPort );
} else
if( document[ 'mozHidden' ] !== undefined ){
} else
if( document[ 'mozHidden' ] !== undefined ){
- X_
EventDispatcher_systemListen( X_ViewPort_document,
'mozvisibilitychange', X_ViewPort );
+ X_
ViewPort_document[ 'listen' ](
'mozvisibilitychange', X_ViewPort );
};
if( window[ 'onpageshow' ] !== undefined ){
};
if( window[ 'onpageshow' ] !== undefined ){
- X_
EventDispatcher_systemListen( X_ViewPort,
[ 'pageshow', 'pagehide' ] );
+ X_
ViewPort[ 'listen' ](
[ 'pageshow', 'pagehide' ] );
};
if( document[ 'onfocusin' ] !== undefined ){
// https://github.com/ai/visibilityjs/blob/master/lib/visibility.fallback.js
};
if( document[ 'onfocusin' ] !== undefined ){
// https://github.com/ai/visibilityjs/blob/master/lib/visibility.fallback.js
- X_
EventDispatcher_systemListen( X_ViewPort_document,
[ 'focusin', 'focusout' ], X_ViewPort );
+ X_
ViewPort_document[ 'listen' ](
[ 'focusin', 'focusout' ], X_ViewPort );
};
};
- X_
EventDispatcher_systemListen( X_ViewPort,
[ 'focus', 'blur' ] );
+ X_
ViewPort[ 'listen' ](
[ 'focus', 'blur' ] );
return X_CALLBACK_UN_LISTEN;
};
return X_CALLBACK_UN_LISTEN;
};
@@
-587,7
+587,7
@@
console.log( 'X.Dom dom:w3c=' + X_UA_DOM.W3C + ' ev:w3c=' + X_UA_EVENT.W3C );
if( X_UA_EVENT.W3C ){
X_ViewPort_document[ 'listenOnce' ]( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );
} else
if( X_UA_EVENT.W3C ){
X_ViewPort_document[ 'listenOnce' ]( 'DOMContentLoaded', X_TEMP.onDomContentLoaded );
} else
-if( 6 <= X_UA[ 'IE' ] && X[ 'inHead' ]
&& !X_UA[ 'ieExeComError' ]
){ // standalone の除外 -> && !X_UA[ 'ieExeComError' ]
+if( 6 <= X_UA[ 'IE' ] && X[ 'inHead' ]
/* && !X_UA[ 'ieExeComError' ] */
){ // standalone の除外 -> && !X_UA[ 'ieExeComError' ]
// if this script in Head
//document.write( '<script id=__ieonload defer src=javascript:void(0)></script>' );
//X_TEMP._script = document.getElementById( '__ieonload' );
// if this script in Head
//document.write( '<script id=__ieonload defer src=javascript:void(0)></script>' );
//X_TEMP._script = document.getElementById( '__ieonload' );