OSDN Git Service

Version 0.6.176, add X.Script.
authoritozyun <itozyun@user.sourceforge.jp>
Tue, 6 Oct 2015 09:00:23 +0000 (18:00 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Tue, 6 Oct 2015 09:00:23 +0000 (18:00 +0900)
22 files changed:
0.6.x/js/01_core/01_X.js
0.6.x/js/01_core/02_XUA.js
0.6.x/js/01_core/03_XType.js
0.6.x/js/01_core/13_XClass.js
0.6.x/js/01_core/14_XEvent.js
0.6.x/js/01_core/15_XEventDispatcher.js
0.6.x/js/01_core/21_XViewPort.js
0.6.x/js/02_dom/08_XNodeSelector.js
0.6.x/js/02_dom/09_XHTMLParser.js
0.6.x/js/02_dom/20_XNode.js
0.6.x/js/02_dom/22_XTreeBuilder.js
0.6.x/js/03_plugin/00_XPlugin.js
0.6.x/js/05_util/04_XXML.js
0.6.x/js/06_net/00_XNet.js
0.6.x/js/06_net/01_XNetXHR.js
0.6.x/js/06_net/03_XNetForm.js
0.6.x/js/06_net/05_XXHRGadget.js
0.6.x/js/06_net/10_XOAuth2.js
0.6.x/js/07_audio/01_XWebAudio.js
0.6.x/js/07_audio/02_XHTMLAudio.js
0.6.x/js/07_audio/03_XSilverlightAudio.js
0.6.x/js/07_audio/10_XAudioSprite.js

index 5c0ef3d..7a74113 100644 (file)
@@ -73,4 +73,3 @@ X[ 'inHead' ] = (function( s ){
        s = s.parentElement || s.parentNode || s;// s is for opera7.11\r
        return s.tagName.toLowerCase() === 'head';// opera7.23 s.tagName is 'HTML'\r
 })( document.scripts || document.getElementsByTagName && document.getElementsByTagName( 'script' ) || document.all && document.all.tags( 'script' ) );\r
-\r
index 426b486..c45d86e 100644 (file)
@@ -243,12 +243,12 @@ var X_UA = X[ 'UA' ] = {},
                         * @alias X.UA.AndroidMinor\r
                         * @type {number}\r
                         */\r
-                       X_UA[ 'AndroidMinor' ]  = parseFloat( v[ 1 ] ) || 0;\r
+                       X_UA[ 'AndroidMinor' ] = parseFloat( v[ 1 ] ) || 0;\r
                        /**\r
                         * @alias X.UA.AndroidPatch\r
                         * @type {number}\r
                         */\r
-                       X_UA[ 'AndroidPatch' ]  = parseFloat( v[ 2 ] ) || 0;\r
+                       X_UA[ 'AndroidPatch' ] = parseFloat( v[ 2 ] ) || 0;\r
                        /**\r
                         * Firefox で Version が取れない!\r
                         * http://bizmakoto.jp/bizid/articles/1207/31/news004.html\r
@@ -331,8 +331,7 @@ var X_UA = X[ 'UA' ] = {},
                 */\r
                X_UA[ '_IE' ]      = parseFloat(dua.split('MSIE ')[1]) || parseFloat(dua.split('rv:')[1]) || parseFloat(dav.split('MSIE ')[1]) || 0;\r
                /**\r
-                * IE11 の互換モードの navigator.appVersion にも Trident/7.0 が書かれているため互換モードか?判定ができる\r
-                * 互換モードでは Silverlight でエラーが出る?\r
+                * IE11 の互換モードの navigator.appVersion にも Trident/7.0 が書かれているため互換モードか?判定ができるc \r
                 * @alias X.UA.Trident\r
                 * @type {number}\r
                 */\r
@@ -351,71 +350,103 @@ var X_UA = X[ 'UA' ] = {},
                 * @type {number}\r
                 */\r
                X_UA[ 'IE' ]   = v = document.documentMode || tridentToVer;\r
-               /**\r
-                * @alias X.UA.IE4\r
-                * @type {boolean}\r
-                */\r
-               if( v && v < 4.5 ) X_UA[ 'IE4' ] = true;\r
-               /**\r
-                * @alias X.UA.IE45\r
-                * @type {boolean}\r
-                */\r
-               if( v && 4.5 <= v && v < 5 ) X_UA[ 'IE45' ] = true;\r
-               /**\r
-                * @alias X.UA.IE4x\r
-                * @type {boolean}\r
-                */\r
-               if( X_UA[ 'IE4' ] || X_UA[ 'IE45' ] ) X_UA[ 'IE4x' ] = true;\r
-               /**\r
-                * @alias X.UA.IE5\r
-                * @type {boolean}\r
-                */\r
-               if( 5 <= v && v < 5.5 ) X_UA[ 'IE5' ] = true;\r
-               /**\r
-                * @alias X.UA.IE55\r
-                * @type {boolean}\r
-                */\r
-               if( 5.5 <= v && v < 6 ) X_UA[ 'IE55' ] = true;\r
-               /**\r
-                * @alias X.UA.IE5x\r
-                * @type {boolean}\r
-                */\r
-               if( X_UA[ 'IE5' ] || X_UA[ 'IE55' ] ) X_UA[ 'IE5x' ] = true;\r
-               /**\r
-                * @alias X.UA.IE6\r
-                * @type {boolean}\r
-                */\r
-               if( 6 <= v && v < 7 ) X_UA[ 'IE6' ] = true;\r
-               /**\r
-                * @alias X.UA.IE7\r
-                * @type {boolean}\r
-                */\r
-               if( 7 <= v && v < 8 ) X_UA[ 'IE7' ] = true;\r
-               /**\r
-                * @alias X.UA.IE8\r
-                * @type {boolean}\r
-                */\r
-               if( 8 <= v && v < 9 ) X_UA[ 'IE8' ] = true;\r
-               /**\r
-                * @alias X.UA.IE9\r
-                * @type {boolean}\r
-                */\r
-               if( 9 <= v && v < 10 ) X_UA[ 'IE9' ] = true;\r
-               /**\r
-                * @alias X.UA.MacIE\r
-                * @type {boolean}\r
-                */\r
-               if( X_UA[ 'Mac' ] ) X_UA[ 'MacIE' ] = true;\r
-               /**\r
-                * @alias X.UA.IEMobile\r
-                * @type {boolean}\r
-                */\r
-               if( dua.toLowerCase().indexOf( 'iemobile' ) !== -1 || X_UA[ 'WinCE' ] ) X_UA[ 'IEMobile' ] = true;\r
-               /**\r
-                * @alias X.UA.WinPhone\r
-                * @type {boolean}\r
-                */\r
-               if( dua.toLowerCase().indexOf( 'windows phone' ) !== -1 || 0 < dav.indexOf( 'ZuneWP' ) ) X_UA[ 'WinPhone' ] = true; // ZuneWP は IEM のデスクトップモードで登場する\r
+\r
+               if( v < 4.5 ){\r
+                       /**\r
+                        * @alias X.UA.IE4\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE4' ] = true;\r
+               } else\r
+               if( v < 5 ){\r
+                       /**\r
+                        * @alias X.UA.IE45\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE45' ] = true;\r
+               } else\r
+               if( v < 5.5 ){\r
+                       /**\r
+                        * @alias X.UA.IE5\r
+                        * @type {boolean}\r
+                        */\r
+                       X_UA[ 'IE5' ] = true;           \r
+               } else\r
+               if( v < 6 ){\r
+                       /**\r
+                        * @alias X.UA.IE55\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE55' ] = true;          \r
+               } else\r
+               if( v < 7 ){\r
+                       /**\r
+                        * @alias X.UA.IE6\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE6' ] = true;   \r
+               } else\r
+               if( v < 8 ){\r
+                       /**\r
+                        * @alias X.UA.IE7\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE7' ] = true;           \r
+               } else\r
+               if( v < 9 ){\r
+                       /**\r
+                        * @alias X.UA.IE8\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE8' ] = true;           \r
+               } else\r
+               if( v < 10 ){\r
+                       /**\r
+                        * @alias X.UA.IE9\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE9' ] = true;\r
+               };\r
+               \r
+               if( X_UA[ 'IE4' ] || X_UA[ 'IE45' ] ){\r
+                       /**\r
+                        * @alias X.UA.IE4x\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE4x' ] = true;\r
+               };\r
+\r
+               if( X_UA[ 'IE5' ] || X_UA[ 'IE55' ] ){\r
+                       /**\r
+                        * @alias X.UA.IE5x\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IE5x' ] = true;\r
+               };\r
+\r
+               if( X_UA[ 'Mac' ] ){\r
+                       /**\r
+                        * @alias X.UA.MacIE\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'MacIE' ] = true;\r
+               };\r
+               \r
+               if( dua.toLowerCase().indexOf( 'iemobile' ) !== -1 || X_UA[ 'WinCE' ] ){\r
+                       /**\r
+                        * @alias X.UA.IEMobile\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'IEMobile' ] = true;\r
+               };\r
+\r
+               if( dua.toLowerCase().indexOf( 'windows phone' ) !== -1 || 0 < dav.indexOf( 'ZuneWP' ) ){\r
+                       /**\r
+                        * @alias X.UA.WinPhone\r
+                        * @type {boolean}\r
+                        */                     \r
+                       X_UA[ 'WinPhone' ] = true; // ZuneWP はデスクトップモードで登場する\r
+               };\r
                \r
                console.log( '>> IE : ' + v + ' ActiveX : ' + X_UA[ 'ActiveX' ] + ' IEHost : ' + X_UA[ 'IEHost' ] );\r
                // TODO XBox360, XBox1, Modern or Desktop, Standalone\r
@@ -541,19 +572,19 @@ var X_UA = X[ 'UA' ] = {},
                console.log( '>> Gecko : ' + X_UA[ 'Gecko' ] );\r
        };\r
        \r
-       if( ( dua.indexOf( 'Linux; U; Android ' ) !== -1 || dua.indexOf( 'Linux; Android ' ) !== -1 ) &&\r
+       // Android 標準ブラウザ AOSP と ChromeWeb View, Sブラウザがある\r
+       if( X_UA[ 'Android' ] &&\r
                ( dua.indexOf( 'Chrome\/' ) === -1 || dua.indexOf( 'Version\/' ) !== -1 ) ){ // Chrome/ を含まない または Version/ を含む\r
                \r
-               /* if( window.chrome ){  // Android3.1 のAOSPブラウザで .chrome がいた、、、\r
-                       //X_UA[ 'Blink' ] = X_UA[ 'ChromeWK' ] = tv;\r
+               /* if( window.chrome ){  // Android3.1 のAOSPブラウザで .chrome がいた、、、\r
                } else */\r
                if( dua.indexOf( 'Version\/' ) === -1 && ( v = parseFloat( dua.split( 'Chrome\/' )[ 1 ] ) ) ){\r
                        /**\r
-                        * Android 標準ブラウザ Chrome Webkit ラップブラウザ\r
-                        * @alias X.UA.ChromeWK\r
+                        * Android 標準ブラウザ Chrome WebView ブラウザ\r
+                        * @alias X.UA.ChromeWV\r
                         * @type {number}\r
                         */                     \r
-                       X_UA[ 'ChromeWK' ] = v;\r
+                       X_UA[ 'ChromeWV' ] = v;\r
                } else\r
                // http://uupaa.hatenablog.com/entry/2014/04/15/163346\r
                // Chrome WebView は Android 4.4 の時点では WebGL や WebAudio など一部の機能が利用できません(can i use)。\r
@@ -561,9 +592,9 @@ var X_UA = X[ 'UA' ] = {},
                // http://caniuse.com/#compare=chrome+40,android+4.2-4.3,android+4.4,android+4.4.3-4.4.4,and_chr+45\r
                // CustomElement の有無で判定\r
                if( document[ 'registerElement' ] ){\r
-                       // UA が偽装された ChromeWK\r
-                       X_UA[ 'ChromeWK' ] = tv;\r
-                       alert( 'UA が偽装された Chrome Webkit' );\r
+                       // UA が偽装された Chrome WebView\r
+                       X_UA[ 'ChromeWV' ] = tv;\r
+                       alert( 'UA が偽装された Chrome WebView' );\r
                } else {\r
                        /**\r
                         * Android 標準ブラウザ AOSP\r
@@ -573,22 +604,14 @@ var X_UA = X[ 'UA' ] = {},
                        X_UA[ 'AOSP' ] = X_UA[ 'Android' ];                     \r
                };\r
                \r
-               i = parseFloat( dua.split( 'WebKit\/' )[ 1 ] );\r
-               /**\r
-                * @alias X.UA.AndroidWebkit\r
-                * @type {number}\r
-                */\r
-               X_UA[ 'AndroidWebkit' ] = i;\r
-               //alert( 'AudioSprite調査:Android標準ブラウザ Webkit Version ' + i );\r
-               \r
                /*\r
                 * http://www.flexfirm.jp/blog/article/402\r
-                * Sブラウザ\r
+                * TODO Sブラウザ\r
                 * SC-04E、SC-01F、SC-02F、 SC-04F、SCL22、SCL23など\r
                 */\r
        } else\r
        \r
-       // TODO Blink\r
+       // Blink Chrome & Blink Opera\r
        if( window.chrome ){\r
                /**\r
                 * @alias X.UA.Blink\r
@@ -797,3 +820,71 @@ X_UA_ATagWrapDiv = (function( e, h ){
 \r
 console.log( 'HTML5? ' + X_UA_ATagWrapDiv ); */\r
 \r
+var X_Script_VBS_ENABLED = X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && !X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 11;\r
+\r
+/**\r
+ * js バージョン間の際を吸収\r
+ * @namespace X.Script\r
+ * @alias X.Script\r
+ * @type {object}\r
+ */\r
+X[ 'Script' ] = {\r
+       'try' : X_Script_try\r
+};\r
+\r
+if( X_UA[ 'IE' ] < 9 && X_Script_VBS_ENABLED ){\r
+       (function( lines ){\r
+               var s = document.createElement( 'script' );\r
+               document.getElementsByTagName("head")[ 0 ].appendChild( s );\r
+               s.type = 'text/vbscript';\r
+               s.text = lines.join( '\n' );\r
+               \r
+       })( [\r
+                               'Function vba_createAXO(v)',\r
+                                       'On Error Resume Next',\r
+                                       'Set ax = CreateObject(v)',\r
+                                       'If Err.Number Then',\r
+                                               'ax = 1',\r
+                                       'End If',\r
+                                       'Err.Clear',\r
+                                       'vba_createAXO = ax',\r
+                               'End Function' /*,\r
+                               \r
+                               'Function vba_try(jsFunc,a1,a2,a3,a4)',\r
+                                       'On Error Resume Next',\r
+                                       'Dim rs = jsFunc(a1,a2,a3,a4)',\r
+                                       'If Err.Number != 0 Then',\r
+                                               'rs = 0',\r
+                                       'End If',\r
+                                       'Err.Clear',\r
+                                       'vba_try = rs',\r
+                               'End Function' */\r
+               ] );\r
+       \r
+       // TODO Object のメンバを辿る vba\r
+};\r
+\r
+function X_Script_try( func, args ){\r
+\r
+       if( X_UA[ 'IE' ] < 5.5 ){\r
+               \r
+       } else {\r
+               return ( new Function( 'f,a', 'try{return f.apply({},a)}catch(e){}' ) )( func, args || [] );\r
+       };\r
+};\r
+\r
+function X_Script_createActiveXObjectSafty( name ){\r
+       if( X_UA[ 'IE' ] < 9 ){\r
+               if( X_Script_VBS_ENABLED ){\r
+                       return window[ 'vba_createAXO' ]( name ) ? null : X_Script_createActiveXObject( name );\r
+               };\r
+               return X_Script_createActiveXObject( name );\r
+       } else {\r
+               return X_Script_try( X_Script_createActiveXObject, [ name ] );\r
+       };\r
+};\r
+\r
+function X_Script_createActiveXObject( name ){\r
+       return new ActiveXObject( name );\r
+};\r
+\r
index 84bca3d..2aada9e 100644 (file)
@@ -113,7 +113,7 @@ X[ 'Type' ] = {
        };\r
 \r
        \r
-       /*\r
+       /**\r
         * new Image した場合に HTMLImageElement が作られるブラウザと,そうでないブラウザ(IE8-)がある\r
         * @alias X.Type.isImage\r
         */     \r
index 4438378..bb0a857 100644 (file)
@@ -238,7 +238,7 @@ X_Class_CommonMethods =
 // --- interface ----------------------------------------------------------- //\r
 // ------------------------------------------------------------------------- //\r
 \r
-/*\r
+/**\r
  * @enum {number}\r
  * @const\r
  */\r
index e54199b..e2a5cda 100644 (file)
@@ -12,8 +12,8 @@ var X_Event_Rename    = {},
                        IFRAMEload_proxy : function( e ){\r
                                var raw = this[ '_rawObject' ];\r
                                \r
-                               return raw.readyState === 'complete' || raw.readyState === 'loaded' ?\r
-                                               this[ 'dispatch' ]( 'load' ) : X_CALLBACK_PREVENT_DEFAULT, X_CALLBACK_STOP_PROPAGATION;\r
+                               return ( raw.readyState === 'complete' || raw.readyState === 'loaded' ) ?\r
+                                               this[ 'dispatch' ]( 'load' ) : X_CALLBACK_PREVENT_DEFAULT | X_CALLBACK_STOP_PROPAGATION;\r
                        },\r
                \r
                // X_UA[ 'Opera' ]\r
index 699c34b..d6140a4 100644 (file)
@@ -44,11 +44,11 @@ var X_EventDispatcher_once       = false,
        \r
        X_EventDispatcher_safariPreventDefault = false, // Safari3-\r
        \r
-       /* @const */\r
+       /** @const */\r
        X_EventDispatcher_EVENT_TARGET_OTHER        = 0,\r
-       /* @const */\r
+       /** @const */\r
        X_EventDispatcher_EVENT_TARGET_XHR          = 1,\r
-       /* @const */\r
+       /** @const */\r
        X_EventDispatcher_EVENT_TARGET_SILVER_LIGHT = 2,\r
        \r
        X_EventDispatcher_LAZY_TIMERS = {}; // Object.<number, X.EventDispatcher> number は timerID\r
index c1a1760..7c29e7d 100644 (file)
@@ -75,7 +75,7 @@ X_ViewPort = X_Class_override(
        
                                case 'blur' :
                                case 'focusout' :
-                                       if( X_UA[ 'IE' ] < 9 ){
+                                       if( 5 < X_UA[ 'IE' ] && X_UA[ 'IE' ] < 9 ){
                                                xnode = X_Node_getXNode( document.activeElement );
                                                if( xnode ){
                                                        xnode[ 'listenOnce' ]( [ 'focus', 'blur' ], X_ViewPort_detectFocusForIE );
@@ -107,15 +107,23 @@ X_ViewPort = X_Class_override(
 );
 
 function X_ViewPort_detectFocusForIE( e ){
-       console.log( 'iefix! ' + e.type + ':' + this.attr( 'tag' ) + ' isActive?:' + ( this[ '_rawObject' ] === document.activeElement ) );
-       
+       //console.log( 'iefix! ' + e.type + ':' + this.attr( 'tag' ) + ' isActive?:' + ( this[ '_rawObject' ] === document.activeElement ) );
+       var elmActive = X_Script_try( X_Object_find, [ document, 'activeElement' ] );
        X_ViewPort_active = e.type === 'focus';
        
-       if( this[ '_rawObject' ] !== document.activeElement ){
+       
+       if( elmActive && this[ '_rawObject' ] !== elmActive ){
                this[ 'unlisten' ]( X_ViewPort_active ? 'blur' : 'focus', X_ViewPort_detectFocusForIE );
+               console.log( '>>>>>> activeElement 取得 不一致 ' + this._tag );
+       } else
+       if( !elmActive ){
+               console.log( '******** activeElement 取得のエラー' );
+       } else if( elmActive ){
+               console.log( '>>>>>> activeElement 取得' );
        };
+
        if( X_ViewPort_activeTimerID ){
-               X_ViewPort_activeTimerID = X_Timer_remove( X_ViewPort_activeTimerID );
+               X_Timer_remove( X_ViewPort_activeTimerID );
        };
        X_ViewPort_activeTimerID = X_Timer_once( 16, X_ViewPort_changeFocus );
        
@@ -251,8 +259,8 @@ X[ 'ViewPort' ] = {
 //(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollLeft == 'number' ? t : document.body).ScrollLeft;
 //(((t = document.documentElement) || (t = document.body.parentNode)) && typeof t.ScrollTop == 'number' ? t : document.body).ScrollTop
        
-       /*
-        * TODO X.Doc へ
+       // TODO X.Doc へ
+       /**
         * @alias X.ViewPort.getDocumentSize
         */
        'getDocumentSize' : function(){
@@ -595,12 +603,12 @@ if( X_UA_EVENT.W3C ){
 } else
 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' );
+       //document.write( '<script id=__ieonload defer src=javascript:void(0)></script>' );
+       //X_TEMP._script = document.getElementById( '__ieonload' );
        
        // 上のコードはスタンドアローン版ie6でエラー
-    //X_TEMP._script = document.createElement( '<script id=__ieonload defer src=javascript:void(0)></script>' ) ;
-    //document.getElementsByTagName( 'head' )[ 0 ].appendChild( X_TEMP._script );
+    X_TEMP._script = document.createElement( '<script id=__ieonload defer src=javascript:void(0)></script>' ) ;
+    document.getElementsByTagName( 'head' )[ 0 ].appendChild( X_TEMP._script );
     
        X_TEMP._script.onreadystatechange = function(){
                var s = X_TEMP._script;
index 727ac95..ca7fcd5 100644 (file)
@@ -281,7 +281,7 @@ function X_Node_Selector__parse( query, last ){
                /*]@+debug*/\r
 \r
                // 文字列以外は空で返す\r
-               if( typeof queryString !== 'string' ) return ret;\r
+               if( !X_Type_isString( queryString ) ) return ret;\r
                \r
                xnodes = [];\r
                \r
@@ -293,7 +293,7 @@ function X_Node_Selector__parse( query, last ){
                        if( !parsed ){\r
                                parsed = X_Node_Selector__parse( queryString );\r
                                \r
-                               if( typeof parsed === 'number' ){\r
+                               if( X_Type_isNumber( parsed ) ){\r
                                        // error\r
                                        return [];\r
                                };\r
@@ -499,7 +499,7 @@ function X_Node_Selector__parse( query, last ){
                                        );\r
                                } else\r
                                // filterが関数の場合\r
-                               if( typeof filter === 'function' ){\r
+                               if( X_Type_isFunction( filter ) ){\r
                                        tmp = [];\r
                                        for( i = 0, n = -1; xnode = xnodes[ i ]; ++i ){\r
                                                if( ( !!filter( xnode ) ) ^ isNot ) tmp[ ++n ] = xnode; \r
index 11a3aa7..6aa4f7f 100644 (file)
@@ -175,8 +175,8 @@ var X_HTMLParser_CHARS = {
                                                ( ( phase = 5 ) && ( attrName = html.substring( start, i ) ) );\r
                                        break;\r
                                case 5 : // 属性の = または次の属性または htmlタグの閉じ\r
-                                       ( whiteSpace[ chr ] & 16 ) ?// ie4 未対応の属性には cite = http:// となる\r
-                                               1 :\r
+                                       !( whiteSpace[ chr ] & 16 ) &&// ie4 未対応の属性には cite = http:// となる\r
+                                       //      1 :\r
                                        ( alphabets[ chr ] & 3 ) ?\r
                                                ( ( phase = 4 ) && ( attrs[ attrs.length ] = attrName ) && ( start = i ) ) :\r
                                        chr === '=' ?\r
index e7d85ec..7fb2e40 100644 (file)
@@ -1497,10 +1497,10 @@ var X_Node__commitUpdate =
                                        X_EventDispatcher_toggleAllEvents( that, true );// イベントの復帰                                
                                        that[ '_flags' ] |= X_NodeFlags_ACTUAL_LISTENING;
                                        
-                                       if( X_Node_documentFragment ){
+                                       //if( X_Node_documentFragment ){
                                                //( frg = X_Node_documentFragment ).appendChild( elm );
                                                // 連続する要素の差し替えの場合に有効
-                                       };
+                                       //};
 
                                        if( X_Node_strictElmCreation ){
                                                that[ '_flags' ] &= X_Node_BitMask_RESET_DIRTY;
index 72eae6b..868261e 100644 (file)
@@ -45,6 +45,7 @@ if( X_UA[ 'MacIE' ] ){
                                parent.replaceChild( document.createComment( '' ), node ); */\r
                                document.body.appendChild( node );\r
                                return;\r
+                               /*\r
                                if( parent.parentNode !== document.body ){\r
                                        var clone = parent.cloneNode( true );\r
                                        for( var i = 0, l = parent.childNodes.length; i < l; ++i ){\r
@@ -61,7 +62,7 @@ if( X_UA[ 'MacIE' ] ){
                                        };\r
                                } else {\r
                                        // ignore\r
-                               };\r
+                               }; */\r
 \r
                        };\r
                        //if( !node.ownerDocument ) alert( 'no owner' );\r
index 961f638..6be1a47 100644 (file)
@@ -19,7 +19,7 @@
 var X_Pulgin_FLASH_VERSION =
                !X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ? parseFloat( X_Object_find( navigator, 'plugins>Shockwave Flash>version' ) || 0 ) :
                !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                           var obj = eval( 'var a,e;try{a=new ActiveXObject("ShockwaveFlash.ShockwaveFlash")}catch(e){}a' ),
+                           var obj = X_Script_createActiveXObjectSafty( 'ShockwaveFlash.ShockwaveFlash' ),
                                ver = obj && obj[ 'GetVariable' ]( '$version' ).split( ' ' ).join( '.' );
                                return parseFloat( ver ) || 0;
                        })() :
@@ -35,7 +35,13 @@ var X_Pulgin_FLASH_VERSION =
        X_Pulgin_SILVER_LIGHT_VERSION = 
                !X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ? parseFloat( X_Object_find( navigator, 'plugins>Silverlight Plug-In>version' ) || 0 ) :
                X_UA[ 'ActiveX' ] && 6 <= X_UA[ 'IE' ] ? (function(){
-                           return eval( 'var a,i=0;try{a=new ActiveXObject("AgControl.AgControl");for(i=5;i;--i)if(a.IsVersionSupported(i+".0"))break;}catch(e){i=0}i' );
+                           var obj = X_Script_createActiveXObjectSafty( 'AgControl.AgControl' ),
+                               i = obj ? 5 : 0, f;
+
+                           for( ; i; --i ){
+                               if( obj[ 'IsVersionSupported' ]( i + '.0' ) ) return i;
+                           };
+                           return 0;
                        })() :
                        0,
 
@@ -48,7 +54,7 @@ var X_Pulgin_FLASH_VERSION =
                !X_UA[ 'IE' ] || !X_UA[ 'ActiveX' ] ?
                        parseFloat( X_Object_find( navigator, 'plugins>Unity Player>version' ) || 0 ) :
                !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                           var obj = eval( 'var a,e;try{a=new ActiveXObject("UnityWebPlayer.UnityWebPlayer.1")}catch(e){}a' );
+                           var obj = X_Script_createActiveXObjectSafty( 'UnityWebPlayer.UnityWebPlayer.1' );
                            return obj ? parseFloat( obj[ 'GetPluginVersion' ]() ) : 0;
                        })() :
                        0,
@@ -61,10 +67,10 @@ var X_Pulgin_FLASH_VERSION =
                window.GearsFactory ||
                ( X_UA[ 'ActiveX' ] && 6 <= X_UA[ 'IE' ] ?
                        (function(){
-                           return eval( 'var a,e;try{a=new ActiveXObject("Gears.Factory")}catch(e){}!!a' );
+                           return X_Script_createActiveXObjectSafty( 'Gears.Factory' );
                        })() :
                        X_Object_find( navigator, 'mimeTypes>application/x-googlegears>enabledPlugin' )
-               ),
+               );
        
        // QuickTime Plug-in 7.7.6
        /*
@@ -76,15 +82,12 @@ var X_Pulgin_FLASH_VERSION =
                                return 0;
                        })( navigator.plugins ) :
                        !X_UA[ 'IE4' ] && !X_UA[ 'IE5' ] && X_UA[ 'ActiveX' ] ? (function(){
-                                   var obj = eval( 'var a,e;try{a=new ActiveXObject("QuickTimeCheckObject.QuickTimeCheck.1")}catch(e){}a' ),
+                                   var obj = QuickTimeCheckObject.QuickTimeCheck.1' ),
                                        ver = obj && obj[ 'QuickTimeVersion' ].toString( 16 );
 
                                        return ver ? parseFloat( ver.substr( 0, 3 ) ) / 100 : 0;
                                })() :
                                0, */
-       
-       X_Pulgin_VBS_ENABLED =
-               X_UA[ 'Windows' ] && !X_UA[ 'WinCE' ] && X_UA[ 'IE' ] < 11;
 
 
 /**
index 39e2b0c..4f7ab2a 100644 (file)
@@ -6,6 +6,8 @@
  *  Original code by ofk ( kQuery, ksk )\r
  *  - http://d.hatena.ne.jp/ofk/comment/20090106/1231258010\r
  *  - http://d.hatena.ne.jp/ofk/20090111/1231668170\r
+ * \r
+ * TODO X.Class で作り、kill を強要する\r
  */\r
 \r
 X[ 'XML' ] = XMLWrapper;\r
@@ -480,6 +482,7 @@ function XMLWrapper_val( queryString, type ){
                };\r
                return res;\r
        };\r
+       /*\r
        function XMLWrapper_funcSelectorProp( prop, flag, flags, xmlList ){\r
                var res = [],\r
                        flag_not = flag ? flags.not : !flags.not,\r
@@ -488,7 +491,7 @@ function XMLWrapper_val( queryString, type ){
                        if( xnode.getAttributeNode( prop ) ^ flag_not ) res[ ++n ] = xnode;\r
                };\r
                return res;\r
-       };\r
+       }; */\r
 \r
 var XMLWrapper_filter = {\r
        'first-child' : {\r
@@ -521,7 +524,7 @@ var XMLWrapper_filter = {
        'nth-last-of-type' : {\r
                m : function( flags, xmlList, a, b ){ return XMLWrapper_funcSelectorNth( 'lastChild', 'previousSibling', false, flags, xmlList, a, b ); }\r
        },\r
-       empty : {\r
+       'empty' : {\r
                m : function( flags, xmlList ){\r
                        var res = [],\r
                                flag_not = flags.not,\r
@@ -539,19 +542,18 @@ var XMLWrapper_filter = {
                        return res;\r
                }\r
        },\r
-       contains : {\r
+       'contains' : {\r
                m : function( flags, xmlList, arg ){\r
                        var res = [],\r
                                flag_not = flags.not,\r
-                               i = 0, n = -1, xnode, text = '',\r
-                               // kquery\r
-                               attr_textContent = X_UA[ 'IE' ] < 9 || X_UA[ 'Opera' ] ? 'innerText' : X_UA[ 'IE9' ] ? 'text' : 'textContent';\r
+                               i = 0, n = -1, xnode, text = '';\r
+\r
                        for( ; xnode = xmlList[ i ]; ++i ){\r
                                switch( xnode.nodeType ){\r
                                        case 1 :\r
-                                               text = xml.nodeType === 1 ? xml.innerText || xml.text || xml.textContent : xml.nodeValue;// xnode[ attr_textContent ];\r
+                                               text = xml.nodeType === 1 ? xml.innerText || xml.text || xml.textContent : xml.nodeValue;\r
                                                break;\r
-                                       case 2 :\r
+                                       //case 2 :\r
                                        case 3 :\r
                                                text = xnode.nodeValue;\r
                                                break;\r
index af64b4d..c693cc2 100644 (file)
@@ -218,7 +218,7 @@ var X_NET_TYPE_XHR   = 1,
 \r
        X_NET_QUEUE_LIST = [],\r
 \r
-       X_NET_XHRWrapper,\r
+       X_XHR,\r
        X_NET_JSONPWrapper,\r
        X_NET_FormWrapper,\r
        X_NET_ImageWrapper,\r
@@ -320,7 +320,7 @@ function X_NET_shiftQueue(){
                                        break;\r
                                \r
                                default :\r
-                                       X_NET_currentWrapper = X_NET_XHRWrapper || X_TEMP.X_Net_XHR_init();\r
+                                       X_NET_currentWrapper = X_XHR || X_TEMP.X_XHR_init();\r
                        };\r
                        \r
                        \r
index d882cc1..411de41 100644 (file)
@@ -46,51 +46,56 @@ TODO クライアント側にもリトライ機構を入れてみる
  */\r
 var // Opera7.6+, Safari1.2+, khtml3.?+, Gecko0.9.7+\r
        // ie9- ではローカルリソースには MSXML を使う\r
-       X_Net_XHR_createW3C   = window[ 'XMLHttpRequest' ] && function(){ return X_Net_XHR_w3c || ( X_Net_XHR_w3c = new XMLHttpRequest() ); },\r
-       X_Net_XHR_w3c         = X_Net_XHR_createW3C && X_Net_XHR_createW3C(),\r
-       X_Net_XHR_cors        = X_Net_XHR_w3c && X_Net_XHR_w3c.withCredentials !== undefined,\r
-       X_Net_XHR_progress    = X_Net_XHR_w3c && X_Net_XHR_w3c.onprogress !== undefined,\r
-       X_Net_XHR_upload      = X_Net_XHR_w3c && !!X_Net_XHR_w3c.upload,\r
+       X_XHR_createW3C   = window[ 'XMLHttpRequest' ] && function(){ return X_XHR_w3c || ( X_XHR_w3c = new XMLHttpRequest() ); },\r
+       X_XHR_w3c         = X_XHR_createW3C && X_XHR_createW3C(),\r
+       X_XHR_cors        = X_XHR_w3c && X_XHR_w3c.withCredentials !== undefined,\r
+       X_XHR_progress    = X_XHR_w3c && X_XHR_w3c.onprogress !== undefined,\r
+       X_XHR_upload      = X_XHR_w3c && !!X_XHR_w3c.upload,\r
        \r
-       X_Net_XHR_createXDR   = window[ 'XDomainRequest' ] && function(){ return X_Net_XHR_xdr || ( X_Net_XHR_xdr = new XDomainRequest() ); },\r
-       X_Net_XHR_xdr         = X_Net_XHR_createXDR && X_Net_XHR_createXDR(),\r
+       X_XHR_createXDR   = window[ 'XDomainRequest' ] && function(){ return X_XHR_xdr || ( X_XHR_xdr = new XDomainRequest() ); },\r
+       X_XHR_xdr         = X_XHR_createXDR && X_XHR_createXDR(),\r
 \r
+       X_XHR_msXMLVer    = 0,\r
+       X_XHR_msXMLName   = '',\r
+       X_XHR_msXML,\r
+               \r
        // ie11の互換モード(7,8)の msxml はいまいち動かない\r
-       X_Net_XHR_createMSXML = X_UA[ 'ActiveX' ] && ( X_UA[ 'IE5x' ] || X_UA[ 'IE6' ] || X_URL_IS_LOCAL ) &&\r
-               ( new Function( 'f', [\r
-                       'var x=".XMLHTTP",',\r
-                               'm="MSXML2"+x,',\r
-                               'n=[m+".6.0",m+".3.0",m+".5.0",m+".4.0",m,"Microsoft"+x],',\r
-                               'v=[6,3,5,4,2,1],',\r
-                               'a=ActiveXObject,',\r
-                               'i=-1;',\r
-                       'for(;i<5;){',\r
-                               'try{',\r
-                                       'return f?[v[++i],new a(n[i])]:new a(n[i])',\r
-                               '}catch(e){}',\r
-                       '}'\r
-               ].join( '' ) ) ),\r
-\r
-       X_Net_XHR_msXMLVer    = 0,      \r
-       X_Net_XHR_msXML       = X_Net_XHR_createMSXML && X_Net_XHR_createMSXML( true ),\r
+       X_XHR_createMSXML = X_UA[ 'ActiveX' ] && ( X_UA[ 'IE5x' ] || X_UA[ 'IE6' ] || X_URL_IS_LOCAL ) &&\r
+                                                       function(){ return X_Script_createActiveXObjectSafty( X_XHR_msXMLName ); },\r
+\r
+\r
        \r
-       X_Net_XHR_neverReuse  = X_UA[ 'IE' ] < 9, // ie7,8 の xhr はリユース不可。msxml はリユース可能。\r
+       X_XHR_neverReuse  = X_UA[ 'IE' ] < 9, // ie7,8 の xhr はリユース不可。msxml はリユース可能。\r
        \r
-       X_Net_XHR_TYPE_FLASH  = 8,\r
-       X_Net_XHR_TYPE_GADGET = 16;\r
-\r
-if( X_Net_XHR_msXML ){\r
-       X_Net_XHR_msXMLVer = X_Net_XHR_msXML[ 0 ];\r
-       X_Net_XHR_msXML    = X_Net_XHR_msXML[ 1 ];\r
-} else {\r
-       X_Net_XHR_createMSXML = null;\r
+       X_XHR_TYPE_FLASH  = 8,\r
+       X_XHR_TYPE_GADGET = 16;\r
+\r
+if( X_XHR_createMSXML ){\r
+       ( function(){\r
+               var x = '.XMLHTTP',\r
+                       m = 'MSXML2' + x,\r
+                       n = [ m + ".6.0", m + ".3.0", m + ".5.0", m + ".4.0", m, "Microsoft" + x ],\r
+                       v = [ 6, 3, 5, 4, 2, 1 ],\r
+                       i = -1,\r
+                       a;\r
+               for( ; i < 5; ){\r
+                       a = X_Script_createActiveXObjectSafty( n[ ++i ] );\r
+                       if( a ){\r
+                               X_XHR_msXMLVer  = v[ i ];\r
+                               X_XHR_msXMLName = n[ i ];\r
+                               X_XHR_msXML     = a;\r
+                               return;\r
+                       };\r
+               };\r
+               X_XHR_createMSXML = null;\r
+       })();\r
 };\r
 \r
 X[ 'XHR' ] = {\r
 \r
-       'W3C'         : X_Net_XHR_createW3C   ? 1 : 0,\r
-       'MSXML'       : X_Net_XHR_createMSXML ? 2 : 0,\r
-       'XDR'         : X_Net_XHR_createXDR   ? 4 : 0,\r
+       'W3C'         : X_XHR_createW3C   ? 1 : 0,\r
+       'MSXML'       : X_XHR_createMSXML ? 2 : 0,\r
+       'XDR'         : X_XHR_createXDR   ? 4 : 0,\r
 \r
 /*\r
  * http://hakuhin.jp/as/import.html\r
@@ -106,30 +111,30 @@ X[ 'XHR' ] = {
  * https://developer.mozilla.org/en-US/docs/Web/API/XMLHttpRequest\r
  * Progress Events     Chrome7, firefox3.5, ie10, opera12, Safari?, Chrome for Android 0.16\r
  */\r
-       'PROGRESS'        : X_Net_XHR_progress,\r
+       'PROGRESS'        : X_XHR_progress,\r
 \r
-       'UPLOAD_PROGRESS' : X_Net_XHR_upload,\r
+       'UPLOAD_PROGRESS' : X_XHR_upload,\r
 \r
        // or gadget proxy or flash\r
-       'CORS'            : X_Net_XHR_xdr || X_Net_XHR_cors,\r
+       'CORS'            : X_XHR_xdr || X_XHR_cors,\r
        \r
-       'BINARY'          : X_Pulgin_VBS_ENABLED\r
+       'BINARY'          : X_Script_VBS_ENABLED\r
 };\r
 \r
-if( X_Net_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_Net_XHR_msXMLVer;\r
+if( X_XHR_msXMLVer ) X[ 'XHR' ][ 'MSXML_VERSION' ] = X_XHR_msXMLVer;\r
 \r
-if( X_Net_XHR_w3c || X_Net_XHR_msXML ){\r
+if( X_XHR_w3c || X_XHR_msXML ){\r
 \r
-X_TEMP.X_Net_XHR_init = function(){\r
-       X_NET_XHRWrapper = X_Class_override( X_EventDispatcher(), X_TEMP.X_Net_XHR_params, true );\r
-       \r
-       delete X_TEMP.X_Net_XHR_init;\r
-       delete X_TEMP.X_Net_XHR_params; \r
+       X_TEMP.X_XHR_init = function(){\r
+               X_XHR = X_Class_override( X_EventDispatcher(), X_TEMP.X_XHR_params, true );\r
+               \r
+               delete X_TEMP.X_XHR_init;\r
+               delete X_TEMP.X_XHR_params;     \r
+               \r
+               return X_XHR;\r
+       };\r
        \r
-       return X_NET_XHRWrapper;\r
-};\r
-\r
-X_TEMP.X_Net_XHR_params = {\r
+       X_TEMP.X_XHR_params = {\r
                        \r
                        '_rawType'   : X_EventDispatcher_EVENT_TARGET_XHR,\r
                        \r
@@ -145,7 +150,7 @@ X_TEMP.X_Net_XHR_params = {
                        _timerID     : 0,\r
                        \r
                        load : function( obj ){\r
-                               var raw      = this[ '_rawObject' ],\r
+                               var raw      = X_XHR[ '_rawObject' ],\r
                                        method   = obj[ 'method' ],\r
                                        url      = obj[ 'url' ],\r
                                        async    = obj[ 'async' ] !== false,\r
@@ -158,43 +163,43 @@ X_TEMP.X_Net_XHR_params = {
                                        xDomain  = !X_URL_isSameDomain( url ),\r
                                        isFile   = X_URL_isLocal( url ),\r
                                        init,\r
-                                       tmp, p;\r
+                                       type, tmp, p;\r
 \r
-                               this._dataType = obj[ 'dataType' ];\r
+                               X_XHR._dataType = obj[ 'dataType' ];\r
                                \r
-                               if( !raw || xDomain !== this._isXDR || ( X_Net_XHR_createMSXML && isFile !== this._isMsXML ) ){\r
-                                       raw && this[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );\r
+                               if( !raw || xDomain !== X_XHR._isXDR || ( X_XHR_createMSXML && isFile !== X_XHR._isMsXML ) ){\r
+                                       raw && X_XHR[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );\r
                                        init = true;\r
-                                       this[ '_rawObject' ] = raw = xDomain ?\r
-                                                                                                       ( X_Net_XHR_cors ?\r
-                                                                                                               X_Net_XHR_createW3C() :\r
-                                                                                                               X_Net_XHR_createXDR()\r
+                                       X_XHR[ '_rawObject' ] = raw = xDomain ?\r
+                                                                                                       ( X_XHR_cors ?\r
+                                                                                                               X_XHR_createW3C() :\r
+                                                                                                               X_XHR_createXDR()\r
                                                                                                        ) :\r
                                                                                                 isFile ?\r
-                                                                                                       ( X_Net_XHR_createMSXML ?\r
-                                                                                                               ( X_Net_XHR_msXML = X_Net_XHR_msXML || X_Net_XHR_createMSXML() ):\r
-                                                                                                               X_Net_XHR_createW3C()\r
+                                                                                                       ( X_XHR_createMSXML ?\r
+                                                                                                               ( X_XHR_msXML = X_XHR_msXML || X_XHR_createMSXML() ):\r
+                                                                                                               X_XHR_createW3C()\r
                                                                                                         ) :\r
-                                                                                                X_Net_XHR_createW3C ?\r
-                                                                                                       X_Net_XHR_createW3C() :\r
-                                                                                                       ( X_Net_XHR_msXML = X_Net_XHR_msXML || X_Net_XHR_createMSXML() );\r
+                                                                                                X_XHR_createW3C ?\r
+                                                                                                       X_XHR_createW3C() :\r
+                                                                                                       ( X_XHR_msXML = X_XHR_msXML || X_XHR_createMSXML() );\r
 \r
                                        // raw === XDR これは error になるのでフラグに控える\r
-                                       this._isXDR   = X_Net_XHR_createXDR && xDomain;\r
-                                       this._isMsXML = !X_Net_XHR_createW3C || ( isFile && X_Net_XHR_createMSXML );\r
+                                       X_XHR._isXDR   = X_XHR_createXDR && xDomain;\r
+                                       X_XHR._isMsXML = !X_XHR_createW3C || ( isFile && X_XHR_createMSXML );\r
                                };\r
                                \r
                                raw.open( method, url, async, username, password );\r
                                \r
                                if( raw.responseType !== undefined ){\r
-                                       switch( this._dataType ){\r
+                                       switch( X_XHR._dataType ){\r
                                                case '' :\r
                                                case 'text' :\r
                                                // js, css\r
                                                        raw.responseType = 'text';\r
                                                        break;\r
                                                case 'json' : // firefox9- は moz-json\r
-                                                       raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? this._dataType : ''; // Iron 37 でエラー\r
+                                                       raw.responseType = X_UA[ 'Gecko' ] < 10 ? 'moz-json' : X_UA[ 'Gecko' ] ? X_XHR._dataType : ''; // Iron 37 でエラー\r
                                                        break;\r
                                                case 'document' :\r
                                                case 'xml' :\r
@@ -206,50 +211,43 @@ X_TEMP.X_Net_XHR_params = {
                                                case 'blob' :\r
                                                case 'arraybuffer' :\r
                                                // jpeg,jpg,png,gif,mp3,ogg...\r
-                                                       raw.responseType = this._dataType;\r
+                                                       raw.responseType = X_XHR._dataType;\r
                                                        break;\r
                                        };\r
                                };\r
                                \r
                                // http://www.quirksmode.org/blog/archives/2005/09/xmlhttp_notes_r_1.html\r
-                               if( !this._isMsXML && raw.overrideMimeType ){   \r
-                                       switch( X_URL_getEXT( url ) || this._dataType ){\r
+                               if( !X_XHR._isMsXML && raw.overrideMimeType ){\r
+                                       type = X_URL_getEXT( url ) || X_XHR._dataType;\r
+                                       switch( type ){\r
                                                case 'html' :\r
                                                case 'htm' :\r
                                                case 'xml' :\r
                                                        tmp = 'text/xml';\r
                                                        break;\r
                                                case 'json' :\r
-                                                       tmp = 'application/json'; // 2015.6.29\r
+                                                       tmp = 'application/json';\r
                                                        break;\r
-\r
                                                case 'mp3' :\r
-                                                       tmp = 'audio/mpeg';\r
-                                                       break;\r
+                                                       type = 'mpeg';  \r
+                                               case 'weba' :\r
+                                                       type = type || 'webm';                  \r
                                                case 'opus' :\r
-                                               case 'ogg' :\r
-                                                       tmp = 'audio/ogg';\r
-                                                       break;\r
-                                               case 'wav' :\r
-                                                       tmp = 'audio/wav';\r
-                                                       break;                                                  \r
+                                                       type = type || 'ogg';\r
+                                               case 'ogg' :    \r
+                                               case 'wav' :                                            \r
                                                case 'aac' :\r
-                                                       tmp = 'audio/aac';\r
+                                                       tmp = 'audio/' + type;\r
                                                        break;\r
                                                case 'm4a' :\r
-                                                       tmp = 'audio/x-m4a"';\r
-                                                       break;  \r
                                                case 'mp4' :\r
-                                                       tmp = 'audio/x-mp4';\r
-                                                       break;  \r
-                                               case 'weba' :\r
-                                                       tmp = 'audio/webm';\r
+                                                       tmp = 'audio/x-' + type;\r
                                                        break;\r
                                        };\r
                                        if( tmp = obj[ 'mimeType' ] || tmp ) raw.overrideMimeType( tmp );\r
                                };\r
 \r
-                               if( !this._isXDR && ( this._isMsXML ? 3 <= X_Net_XHR_msXMLVer : raw.setRequestHeader ) ){ // msxml は setRequestHeader getter がいけない\r
+                               if( !X_XHR._isXDR && ( X_XHR._isMsXML ? 3 <= X_XHR_msXMLVer : raw.setRequestHeader ) ){ // msxml は setRequestHeader getter がいけない\r
                                        \r
                                        /*\r
                                        if( noCache ){\r
@@ -260,7 +258,7 @@ X_TEMP.X_Net_XHR_params = {
                \r
                                        // http://nakigao.sitemix.jp/blog/?p=2040\r
                                        // json 取得時に SafariでHTTP/412のエラー。但し相手が audio の場合この指定があるとロードに失敗する。 iOS8.2, iOS7.1 では遭遇せず\r
-                                       if( this._dataType === 'json' ){\r
+                                       if( X_XHR._dataType === 'json' ){\r
                                                headers[ 'If-Modified-Since' ] = ( new Date ).toUTCString();\r
                                        };\r
                                        \r
@@ -275,65 +273,64 @@ X_TEMP.X_Net_XHR_params = {
 \r
                                        \r
                                        for( p in headers ){\r
-                                               if( X_EMPTY_OBJECT[ p ] ) continue;\r
+                                               //if( X_EMPTY_OBJECT[ p ] ) continue;\r
                                                //console.log( headers[ p ] );\r
                                                headers[ p ] !== undefined && raw.setRequestHeader( p, headers[ p ] + '' ); // Opera8.01+, MSXML3+\r
                                        };\r
                                };\r
                                \r
-                               if( !this._isMsXML && raw.timeout !== undefined ){\r
+                               if( !X_XHR._isMsXML && raw.timeout !== undefined ){\r
                                        raw.timeout = timeout;\r
                                } else {\r
-                                       this._timerID = X_Timer_once( timeout, this, this.onTimeout );\r
+                                       X_XHR._timerID = X_Timer_once( timeout, X_XHR.onTimeout );\r
                                };      \r
                                \r
                                // send 前にフラグを立てる,回線が早いと raw.send() 内で onload -> _busy = false ののち、 _busy = true するため。\r
-                               this._busy = true;\r
+                               X_XHR._busy = true;\r
 \r
                                raw.send( X_Type_isString( postdata ) ? postdata : X_String_serialize( postdata ) );\r
 \r
                                if( !async || raw.readyState === 4 ){\r
-                                       X_Timer_once( 32, this, this.handleEvent, [ { type : 'readystatechange' } ] );\r
+                                       X_Timer_once( 32, X_XHR, [ { type : 'readystatechange' } ] );\r
                                } else\r
                                if( init ){\r
-                                       if( this._isMsXML ){\r
-                                               raw[ 'onreadystatechange' ] = X_NET_XHRWrapper.handleEvent;\r
+                                       if( X_XHR._isMsXML ){\r
+                                               raw[ 'onreadystatechange' ] = X_XHR.handleEvent;\r
                                        } else\r
-                                       if( X_Net_XHR_progress || this._isXDR ){\r
-                                               this[ 'listen' ]( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'\r
+                                       if( X_XHR_progress || X_XHR._isXDR ){\r
+                                               X_XHR[ 'listen' ]( [ 'load', 'progress', 'error', 'timeout' ] ); //, 'abort'\r
                                        } else\r
                                        if( X_UA[ 'IE8' ] ){\r
-                                               this[ 'listen' ]( [ 'readystatechange', 'error', 'timeout' ] );\r
+                                               X_XHR[ 'listen' ]( [ 'readystatechange', 'error', 'timeout' ] );\r
                                        } else\r
                                        if( X_UA[ 'IE7' ] ){\r
-                                               this[ 'listen' ]( [ 'readystatechange', 'error' ] );\r
-                                       \r
+                                               X_XHR[ 'listen' ]( [ 'readystatechange', 'error' ] );\r
                                        } else {\r
-                                               this[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
+                                               X_XHR[ 'listen' ]( [ 'load', 'readystatechange', 'error', 'timeout' ] ); //, 'abort'\r
                                        };\r
                                \r
-                                       if( X_Net_XHR_upload ){\r
-                                               raw.upload.addEventListener( 'progress', this.onUploadProgress );\r
+                                       if( X_XHR_upload ){\r
+                                               raw.upload.addEventListener( 'progress', X_XHR.onUploadProgress );\r
                                        };\r
                                };\r
                        },\r
                        \r
                        cancel : function(){\r
-                               /* this[ '_rawObject' ].abort && */ this[ '_rawObject' ].abort();\r
-                               this._canceled = true;\r
+                               /* X_XHR[ '_rawObject' ].abort && */ X_XHR[ '_rawObject' ].abort();\r
+                               X_XHR._canceled = true;\r
                        },\r
                        \r
                        reset : function(){\r
                                \r
-                               this._method   = this._dataType = '';\r
-                               this._canceled = this._busy = this._error = false;\r
-                               this._timerID && X_Timer_remove( this._timerID );\r
-                               this._percent  = this._timerID = 0;\r
+                               X_XHR._method   = X_XHR._dataType = '';\r
+                               X_XHR._canceled = X_XHR._busy = X_XHR._error = false;\r
+                               X_XHR._timerID && X_Timer_remove( X_XHR._timerID );\r
+                               X_XHR._percent  = X_XHR._timerID = 0;\r
                                \r
                                // XMLHttpRequest の使い方\r
                                // http://webos-goodies.jp/archives/50548720.html\r
                                // XMLHttpRequest オブジェクトを再利用する際も、 abort メソッドを呼び出す必要があるようです。\r
-                               /* this[ '_rawObject' ].abort && */ this[ '_rawObject' ].abort();       \r
+                               /* X_XHR[ '_rawObject' ].abort && */ X_XHR[ '_rawObject' ].abort();     \r
                                \r
                                // XMLHttpRequest で順番にリソースを取得する\r
                                // http://note.chiebukuro.yahoo.co.jp/detail/n16248\r
@@ -346,32 +343,32 @@ X_TEMP.X_Net_XHR_params = {
                                \r
                                // Timeout した Gecko の xhr.response に触るとエラー??\r
 \r
-                               if( this._error || ( X_Net_XHR_neverReuse && !this._isMsXML ) ){\r
+                               if( X_XHR._error || ( X_XHR_neverReuse && !X_XHR._isMsXML ) ){\r
                                        \r
-                                       if( X_Net_XHR_upload ){\r
-                                               X_Net_XHR_w3c.upload.removeEventListener( 'progress', this.onUploadProgress );\r
+                                       if( X_XHR_upload ){\r
+                                               X_XHR_w3c.upload.removeEventListener( 'progress', X_XHR.onUploadProgress );\r
                                        };\r
 \r
                                        // ie7 は xhr object を再利用できない。但し send のあとに alert を挟むと動いた、、、\r
                                        // ie7モード(IE11) では再利用可能、、、\r
                                                                                \r
-                                       X_EventDispatcher_toggleAllEvents( this, false );\r
-                                       this[ '_rawObject' ] = null;\r
+                                       X_EventDispatcher_toggleAllEvents( X_XHR, false );\r
+                                       X_XHR[ '_rawObject' ] = null;\r
                                        \r
-                                       if( this._isXDR ){\r
-                                               X_Net_XHR_xdr   = null;\r
-                                               delete this._isXDR;\r
+                                       if( X_XHR._isXDR ){\r
+                                               X_XHR_xdr   = null;\r
+                                               delete X_XHR._isXDR;\r
                                        } else {\r
-                                               X_Net_XHR_w3c   = null;\r
+                                               X_XHR_w3c   = null;\r
                                        };                              \r
 \r
-                                       this[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );\r
+                                       X_XHR[ 'unlisten' ]( [ 'load', 'readystatechange', 'progress', 'error', 'timeout' ] );\r
                                };\r
                        },\r
                        \r
                        handleEvent : function( e ){\r
-                               var raw  = X_NET_XHRWrapper[ '_rawObject' ],\r
-                                       live = !X_NET_XHRWrapper._canceled,\r
+                               var raw  = X_XHR[ '_rawObject' ],\r
+                                       live = !X_XHR._canceled,\r
                                        headers, status, data;\r
 \r
                                switch( e && e.type || 'readystatechange' ){\r
@@ -396,14 +393,14 @@ X_TEMP.X_Net_XHR_params = {
                                                                case 1 :\r
                                                                        return;\r
                                                                case 2 : // 0% ajaxstart\r
-                                                                       live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : 0 } );\r
+                                                                       live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : 0 } );\r
                                                                        return;\r
                                                                case 3 :\r
-                                                                       live && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent < 99.9 ? 99.9 : ( X_NET_XHRWrapper._percent + 100 ) / 2 } );\r
+                                                                       live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_XHR._percent < 99.9 ? 99.9 : ( X_XHR._percent + 100 ) / 2 } );\r
                                                                        // 99.9%\r
                                                                        return;\r
                                                                case 4 :\r
-                                                                       if( X_NET_XHRWrapper._percent === 100 ) return; // Opera8 readystatechange が2重に発生\r
+                                                                       if( X_XHR._percent === 100 ) return; // Opera8 readystatechange が2重に発生\r
                                                                        // 100%\r
                                                                        break; // load へ\r
                                                                default :\r
@@ -414,19 +411,19 @@ X_TEMP.X_Net_XHR_params = {
        \r
                                        case 'load' :\r
 \r
-                                               if( !X_NET_XHRWrapper._busy ) return;\r
+                                               if( !X_XHR._busy ) return;\r
                                                \r
-                                               X_NET_XHRWrapper._percent = 100;\r
-                                               X_NET_XHRWrapper._busy    = false;\r
+                                               X_XHR._percent = 100;\r
+                                               X_XHR._busy    = false;\r
                                                status        = raw.status;\r
                                                \r
                                                // TODO GET_FULL_HEADERS\r
                                                // https://msdn.microsoft.com/en-us/library/ms766595%28v=vs.85%29.aspx\r
                                                // Implemented in: MSXML 3.0 and MSXML 6.0\r
-                                               if( X_NET_XHRWrapper._isXDR ){\r
+                                               if( X_XHR._isXDR ){\r
                                                        headers = { 'Content-Type' : raw.contentType };\r
                                                } else\r
-                                               if( ( X_NET_XHRWrapper._isMsXML ? 3 <= X_Net_XHR_msXMLVer : raw.setRequestHeader ) && ( headers = raw.getAllResponseHeaders() ) ){\r
+                                               if( ( X_XHR._isMsXML ? 3 <= X_XHR_msXMLVer : raw.setRequestHeader ) && ( headers = raw.getAllResponseHeaders() ) ){\r
                                                        headers = X_NET_XHR_parseResponseHeaders( headers );\r
                                                };\r
                                                \r
@@ -445,7 +442,7 @@ X_TEMP.X_Net_XHR_params = {
                                                         */\r
                                                        \r
                                                        // parse json, html, xml, text, script, css\r
-                                                       switch( X_NET_XHRWrapper._dataType ){\r
+                                                       switch( X_XHR._dataType ){\r
                                                                case '' :\r
                                                                case 'text' :\r
                                                                        data = raw[ 'responseText' ];\r
@@ -470,56 +467,55 @@ X_TEMP.X_Net_XHR_params = {
                                                                        data = raw[ 'response' ] || raw[ 'responseText' ]; // とりあえず\r
                                                                        break;\r
                                                        };\r
-                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );\r
+                                                       X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_SUCCESS, status : status || 200, response : data, 'headers' : headers || null } );\r
                                                } else {\r
-                                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );\r
+                                                       X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : status || 400, 'headers' : headers || null } );\r
                                                };\r
                                                break;\r
                                        \r
                                        case 'progress' :\r
                                                if( e.lengthComputable ){\r
-                                                       X_NET_XHRWrapper._percent = e.loaded / e.total * 100;\r
-                                                       live && X_NET_XHRWrapper._percent < 100 && X_NET_XHRWrapper[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_NET_XHRWrapper._percent } );\r
+                                                       X_XHR._percent = e.loaded / e.total * 100;\r
+                                                       live && X_XHR._percent < 100 && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_PROGRESS, 'percent' : X_XHR._percent } );\r
                                                };\r
                                                break;\r
                                        \r
                                        case 'error' :\r
                                        //console.dir( e );\r
-                                               X_NET_XHRWrapper._busy  = false;\r
-                                               X_NET_XHRWrapper._error = X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] ;\r
-                                               live && X_NET_XHRWrapper[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status } );\r
+                                               X_XHR._busy  = false;\r
+                                               X_XHR._error = X_UA[ 'Opera' ] || X_UA[ 'Webkit' ] ;\r
+                                               live && X_XHR[ 'asyncDispatch' ]( 32, { type : X_EVENT_ERROR, status : raw.status } );\r
                                                break;\r
 \r
                                        case 'timeout' : // Gecko 12.0 https://developer.mozilla.org/ja/docs/XMLHttpRequest/Synchronous_and_Asynchronous_Requests\r
-                                               X_NET_XHRWrapper._busy  = false;\r
-                                               X_NET_XHRWrapper._error = !!X_UA[ 'Gecko' ];\r
-                                               X_NET_XHRWrapper[ 'asyncDispatch' ]( { type :X_EVENT_ERROR, 'timeout' : true, status : 408 } );\r
+                                               X_XHR._busy  = false;\r
+                                               X_XHR._error = !!X_UA[ 'Gecko' ];\r
+                                               X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );\r
                                                break;\r
                                };\r
                        },\r
                        \r
                        onTimeout : function(){\r
-                               var raw  = this[ '_rawObject' ],\r
-                                       live = !X_NET_XHRWrapper._canceled || !this._busy;\r
+                               var raw  = X_XHR[ '_rawObject' ],\r
+                                       live = !X_XHR._canceled || !X_XHR._busy;\r
 \r
                                if( live || raw.readyState < 3 ){\r
-                                       this._busy = false;\r
-                                       live && this[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );\r
+                                       X_XHR._busy = false;\r
+                                       live && X_XHR[ 'asyncDispatch' ]( { type : X_EVENT_ERROR, 'timeout' : true, status : 408 } );\r
                                };\r
-                               this._timerID = 0;\r
+                               X_XHR._timerID = 0;\r
                        },\r
                        \r
-                       onUploadProgress : X_Net_XHR_upload && function( e ){\r
-                               !X_NET_XHRWrapper._canceled &&\r
-                                       X_NET_XHRWrapper[ 'asyncDispatch' ]( {\r
+                       onUploadProgress : X_XHR_upload && function( e ){\r
+                               !X_XHR._canceled &&\r
+                                       X_XHR[ 'asyncDispatch' ]( {\r
                                                type            : X_EVENT_PROGRESS,\r
-                                               'percent'       : X_NET_XHRWrapper._percent,\r
+                                               'percent'       : X_XHR._percent,\r
                                                'uploadPercent' : e.loaded / e.total * 100\r
                                        } );\r
                        }\r
                };\r
        // 同期リクエストでなければならない場合, unload, beforeunload時\r
-\r
 };\r
 /*\r
  * https://gist.github.com/mmazer/5404301\r
index ce5021a..1bfd498 100644 (file)
@@ -37,8 +37,7 @@ X_TEMP.X_NET_Form_params = {
                                        '<form method="', X_NET_Form_escapeQuote( option[ 'method' ] || 'GET' ), \r
                                                '" action="', X_NET_Form_escapeQuote( option[ 'url' ] || '' ), \r
                                                '" target="', X_NET_Form_escapeQuote( target || '_self' ),\r
-                                               '">' ],\r
-                               k;\r
+                                               '">' ];\r
                                \r
                                if( target === '_top' || target === '_parent' ) this.isJump = true;\r
                                if( 0 <= option[ 'timeout' ] ) this.timeout = option[ 'timeout' ];\r
index 16d83be..9b89fdc 100644 (file)
@@ -31,8 +31,6 @@ var X_NET_GIMR_canUse         = 5.5 <= X_UA[ 'IE' ] || !X_UA[ 'IE' ],
        // https://code.google.com/p/xssinterface/source/browse/trunk/js/xssinterface.js\r
        X_NET_GIMR_maxQueryLength = X_UA[ 'IE' ] ? 2000 : 6000,\r
        \r
-       X_NET_GIMR_detection      = new Function( 'f,j,i', 'for(j=f.length;j;)try{i=f[--j];return i.location.hash}catch(e){}' ),\r
-       \r
        X_NET_GIMR_requestBatches,\r
        \r
        X_NET_GIMR_requestOriginal,\r
@@ -48,13 +46,15 @@ var X_NET_GIMR_canUse         = 5.5 <= X_UA[ 'IE' ] || !X_UA[ 'IE' ],
 \r
 function X_NET_GIMR_detectImageOverIframe(){\r
        var raw = this[ '_rawObject' ],\r
-               iwin, ret, n;\r
+               iwin, ret, i, n;\r
        \r
        if( raw ){\r
                iwin = raw.contentWindow || ( raw.contentDocument && raw.contentDocument.parentWindow ) || window.frames[ X_NET_GIMR_iframeName ];\r
                \r
-               if( iwin && iwin.frames && iwin.frames.length ){\r
-                       ret = X_NET_GIMR_detection( iwin.frames );\r
+               if( iwin && iwin.frames && ( i = iwin.frames.length ) ){\r
+                       for( ; i; ){\r
+                               if( ret = X_Script_try( X_Object_find, [ iwin.frames[ --i ], 'location.hash' ] ) ) break;\r
+                       };\r
                        if( ret && ret !== X_NET_GIMR_lastHashString ){\r
                                X_NET_GIMR_lastHashString = ret;\r
                                //console.log( ret.length );\r
index 86d1584..6d28665 100644 (file)
@@ -1,7 +1,6 @@
 
 //{+oauth2"OAuth2 サービスの定義"(OAuth2外部サービスを定義し、認可プロセス・xhrの署名を自動化します)[+xhr]
-var X_NET_OAUTH2_detection      = new Function( 'w', 'try{return w.location.search}catch(e){}' ),
-       X_NET_OAUTH2_authorizationWindow,
+var X_NET_OAUTH2_authorizationWindow,
        X_NET_OAUTH2_authorizationTimerID;
 
 /**
@@ -236,7 +235,7 @@ function X_Net_OAuth2_detectAuthPopup(){
 
                this[ 'asyncDispatch' ]( X_EVENT_CANCELED );
        } else
-       if( search = X_NET_OAUTH2_detection( X_NET_OAUTH2_authorizationWindow ) ){
+       if( search = X_Script_try( X_Object_find, [ X_NET_OAUTH2_authorizationWindow, 'location>search' ] ) ){
                pair      = X_Pair_get( this );
                pair.code = X_URL_paramToObj( search.slice( 1 ) )[ 'code' ];
 
@@ -394,7 +393,7 @@ function X_OAuth2_getAccessTokenExpiry( that ){ return parseInt( X_OAuth2_update
 function X_OAuth2_getAuthMechanism( that ){
                // TODO use gadget | flash ...
                // IE's XDomainRequest doesn't support sending headers, so don't try.
-               return ( X_NET_currentWrapper === X_NET_XHRWrapper ) && X_Net_XHR_createXDR ? 'param' : X_OAuth2_updateLocalStorage( '', that, 'AuthMechanism' );
+               return ( X_NET_currentWrapper === X_XHR ) && X_XHR_createXDR ? 'param' : X_OAuth2_updateLocalStorage( '', that, 'AuthMechanism' );
        }
 function X_OAuth2_setAccessToken( that, value ){ X_OAuth2_updateLocalStorage( '+', that, 'accessToken' , value); }
 function X_OAuth2_setRefreshToken( that, value ){ X_OAuth2_updateLocalStorage( '+', that, 'refreshToken', value); }
index bded21f..522443d 100644 (file)
@@ -328,13 +328,14 @@ if( X_WebAudio_context ){
                    
                    // おかしい、stop 前に外していても呼ばれる、、、@Firefox33.1
                    // 破棄された X.Callback が呼ばれて、obj.proxy() でエラーになる。Firefox では、onended は使わない
-                if( false && this.bufferSource.onended !== undefined ){
+                   // 多くのブラウザで onended は timer を使ったカウントより遅いので使わない
+                //if( this.bufferSource.onended !== undefined ){
                        //console.log( '> use onended' );
-                       this.bufferSource.onended = this._onended || ( this._onended = X_Closure_create( this, this._onEnded ) );
-                } else {
+                       //this.bufferSource.onended = this._onended || ( this._onended = X_Closure_create( this, this._onEnded ) );
+                //} else {
                        this._timerID && X_Timer_remove( this._timerID );
                                        this._timerID = X_Timer_once( end - begin, this, this._onEnded );
-                };
+                //};
        
                    if( this.bufferSource.start ){
                        this.bufferSource.start( 0, begin / 1000, end / 1000 );
index a231e67..e792bcd 100644 (file)
@@ -22,7 +22,7 @@ var X_HTMLAudio_playTrigger =
                X_UA[ 'iOS' ] < 5  ? 'stalled' :\r
                X_UA[ 'iOS' ]      ? 'suspend' :\r
                X_UA[ 'Safari' ] < 4 ? 'canplaythrough' :\r
-               X_UA[ 'ChromeWK' ]   ? 'canplaythrough' :\r
+               X_UA[ 'ChromeWV' ]   ? 'canplaythrough' :\r
                // Android 2.3.5(SBM101SH) では stalled は発生しない,,, ので必ず loadeddata もチェックする\r
                X_UA[ 'AOSP' ] ? 'stalled' :\r
                X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ? 'loadeddata' :\r
@@ -52,7 +52,7 @@ var X_HTMLAudio_playTrigger =
        X_HTMLAudio_pauseFix            = ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] && 0 < ' XP XPSP2 2003|XP64'.indexOf( X_UA[ 'Windows' ] ) ), // XP + Opera12 のみ?\r
        /*\r
         * durationFix\r
-        *  duration が取得できるタイミングが遅くそれまでは infinity(PC Opera12), NaN(WP9), 0(AOSP Chrome 系) が入っている\r
+        *  duration が取得できるタイミングが遅くそれまでは infinity(PC Opera12), NaN(WP9), 0(Android 標準ブラウザ ChromeWebkit 系) が入っている\r
         * \r
         *   1. touch が不要の場合、自動で再生を開始して duration を取得するまで再生する\r
         *        -> 取得後に pause or 通常再生\r
@@ -65,8 +65,8 @@ var X_HTMLAudio_playTrigger =
         *        -> その際には timeupdate が発行されない、、、 iframe+image+audio で使わないときは破棄する、とか。\r
         *        -> opera11、10.54 WinXP はまとも、、、 portable が怪しい??\r
         */\r
-       X_HTMLAudio_need1stTouch        = X_UA[ 'iOS' ] || X_UA[ 'ChromeWK' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),       \r
-       X_HTMLAudio_durationFix     = ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || X_UA[ 'ChromeWK' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
+       X_HTMLAudio_need1stTouch        = X_UA[ 'iOS' ] || X_UA[ 'ChromeWV' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),       \r
+       X_HTMLAudio_durationFix     = ( X_UA[ 'Windows' ] && 12 <= X_UA[ 'Opera' ] ) || X_UA[ 'ChromeWV' ] || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
        \r
        X_HTMLAudio_shortPlayFix        = X_UA[ 'AOSP' ]; // Android 4.1.1 でも遭遇(ただしm4a, mp3は優秀, oggはシークが乱れる)\r
        \r
index 7133272..3a3f0b0 100644 (file)
@@ -222,11 +222,10 @@ if( X[ 'Pulgin' ][ 'Silverlight' ] ){
                                                        // stop()\r
                                                        case 'Stopped':\r
                                                                this.playing && X_Timer_once( 16, this, this.actualPlay );\r
-                                                               return;\r
                                                                \r
                                                                //this.playing = false;\r
-                                                               this._ended  = true;\r
-                                                               this._paused = false;\r
+                                                               //this._ended  = true;\r
+                                                               //this._paused = false;\r
                                                                //this.setCurrentTime( this.startTime );\r
                                                                break;\r
                                                };\r
index 99ff9b2..cd11ea6 100644 (file)
@@ -4,23 +4,23 @@
  * Mobile Opera11 は Audio をサポートするがイベントが取れない\r
  * iframe 内で生成して、Audio Sprite の preset で再生できないか?\r
  */\r
-var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ] || X_UA[ 'AndroidBrowser' ] || X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ), // Flash がない\r
-       X_Audio_Sprite_useVideoForMulti = //( X_UA[ 'AndroidBrowser3' ] && 3.1 <= X_UA[ 'AndroidBrowser' ] ) || \r
-                                                                         //( ( 4.2 <= X_UA[ 'AndroidBrowser' ] || ( 4.1 <= X_UA[ 'AndroidBrowser' ] && 2 <= X_UA[ 'AndroidPatch' ] ) ) && X_UA[ 'AndroidWebkit' ] <= 534.3 ),\r
-                                                                         // ドスパラパッドはビデオのインライン再生が不可, 534.30 で Webkit系は終了, 次は 537.36 で Chrome系\r
-                                                                         false, //X_UA[ 'AndroidChromeBrowser' ],\r
-       X_Audio_Sprite_needTouchAndroid = X_UA[ 'AndroidChromeBrowser' ] && !X_Audio_WebAudioWrapper,\r
-       X_Audio_Sprite_needTouchFirst   = X_UA[ 'iOS' ] || X_Audio_Sprite_needTouchAndroid || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
-       X_Audio_Sprite_disableMultiTrack = ( X_UA[ 'iOS' ] && !X_Audio_WebAudio_context ) || ( !X_UA[ 'AndroidChromeBrowser' ] && X_UA[ 'AndroidBrowser4' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 12 ),\r
-       X_Audio_Sprite_enableVolume     = window.HTMLAudioElement && ( !X_UA[ 'iOS' ] && !X_UA[ 'AndroidBrowser' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は 25以上\r
+var X_AudioSprite_shouldUse        = X_HTMLAudio && ( X_UA[ 'iOS' ] || X_UA[ 'AOSP' ] || X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ), // Flash がない\r
+       X_AudioSprite_useVideoForMulti = //( 3.1 <= X_UA[ 'AOSP' ] < 4 ) || \r
+                                                                         //( ( 4.2 <= X_UA[ 'AOSP' ] ),\r
+                                                                         // ドスパラパッドはビデオのインライン再生が不可\r
+                                                                         false, //X_UA[ 'ChromeWV' ],\r
+       X_AudioSprite_needTouchAndroid = X_UA[ 'ChromeWV' ] && !X_WebAudio,\r
+       X_AudioSprite_needTouchFirst   = X_HTMLAudio_need1stTouch,\r
+       X_AudioSprite_disableMultiTrack = ( X_UA[ 'iOS' ] && !X_WebAudio_context ) || ( X_UA[ 'AOSP4' ] ) || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE' ] < 12 ),\r
+       X_AudioSprite_enableVolume     = X_HTMLAudio && ( !X_UA[ 'iOS' ] && !X_UA[ 'AOSP' ] && !X_UA[ 'OperaMobile' ] && !X_UA[ 'OperaTablet' ] ), // TODO fennec は 25以上\r
        // http://tukumemo.com/html5-audio-sp/\r
        // iOS6、Android4.1から同時再生が可能になりました。\r
-       X_Audio_Sprite_maxTracks        = X_Audio_Sprite_useVideoForMulti ? 2 : X_Audio_Sprite_disableMultiTrack ? 1 : 9,\r
-       X_Audio_Sprite_lengthSilence    = 10000, // 一番最初の無音部分の長さ\r
-       X_Audio_Sprite_lengthDistance   = 5000,  // 音間の無音の長さ\r
-       X_Audio_Sprite_uid              = 0,\r
-       X_Audio_Sprite_members          = {},\r
-       X_Audio_Sprite_TEMP             = {\r
+       X_AudioSprite_maxTracks        = X_AudioSprite_useVideoForMulti ? 2 : X_AudioSprite_disableMultiTrack ? 1 : 9,\r
+       X_AudioSprite_lengthSilence    = 10000, // 一番最初の無音部分の長さ\r
+       X_AudioSprite_lengthDistance   = 5000,  // 音間の無音の長さ\r
+       X_AudioSprite_uid              = 0,\r
+       X_AudioSprite_members          = {},\r
+       X_AudioSprite_TEMP             = {\r
                presets     : {},\r
                BGMs        : {},\r
                tracks      : [],\r
@@ -32,14 +32,34 @@ var X_Audio_Sprite_shouldUse        = window.HTMLAudioElement && ( X_UA[ 'iOS' ]
                bgmLooped   : false,\r
                bgmPlaying  : false\r
        },\r
-       X_Audio_Sprite_instance,\r
-       X_Audio_Sprite_numTracks,\r
-       X_Audio_Sprite_useVideo;\r
+       X_AudioSprite_instance,\r
+       X_AudioSprite_numTracks,\r
+       X_AudioSprite_useVideo;\r
 \r
+/**\r
+ * {\r
+ *      urls      : [ 'xx.ogg', 'xx.mp3' ],\r
+ *      numTracks : 3,\r
+ *   useVideo  : false,\r
+ *   volume    : 1,\r
+ *      BGM_01 : [ '15.00', '45.500', true, '17.666', '50.999' ],\r
+ *   BGM_02 : [ '56.00', '1:15.230', true ]\r
+ * }\r
+ * \r
+ * X_EVENT_BACKEND_READY\r
+ * X_EVENT_BACKEND_NONE\r
+ * \r
+ * X_EVENT_READY\r
+ * X_EVENT_MEDIA_LOOPED\r
+ * X_EVENT_MEDIA_ENDED\r
+ * \r
+ * @namespace X.AudioSprite\r
+ * @alias X.AudioSprite\r
+ */ \r
 X[ 'AudioSprite' ] = function( setting ){\r
-       var tracks  = X_Audio_Sprite_TEMP.tracks,\r
-               bgms    = X_Audio_Sprite_TEMP.BGMs,\r
-               presets = X_Audio_Sprite_TEMP.presets,\r
+       var tracks  = X_AudioSprite_TEMP.tracks,\r
+               bgms    = X_AudioSprite_TEMP.BGMs,\r
+               presets = X_AudioSprite_TEMP.presets,\r
                urls    = setting[ 'urls' ],\r
                video   = setting[ 'useVideo' ],\r
                n       = video ? 1 : setting[ 'numTracks' ] || 1,\r
@@ -47,21 +67,21 @@ X[ 'AudioSprite' ] = function( setting ){
                        volume    : setting[ 'volume' ] || 0.5,\r
                        autoplay  : false,\r
                        startTime : 0,\r
-                       endTime   : X_Audio_Sprite_lengthSilence,\r
+                       endTime   : X_AudioSprite_lengthSilence,\r
                        loop      : true\r
                },\r
                k, i, v, track; \r
        \r
-       if( !X_Audio_Sprite_instance ){\r
-               X_Audio_Sprite_instance = X_Class_override( X_EventDispatcher(), X_Audio_Sprite_members );\r
-               X_ViewPort[ 'listen' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], X_Audio_Sprite_instance, X_Audio_Sprite_handleEvent );\r
+       if( !X_AudioSprite_instance ){\r
+               X_AudioSprite_instance = X_Class_override( X_EventDispatcher(), X_AudioSprite_members );\r
+               X_ViewPort[ 'listen' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], X_AudioSprite_instance, X_AudioSprite_handleEvent );\r
        };\r
        \r
-       n = n <= X_Audio_Sprite_maxTracks ? n : X_Audio_Sprite_maxTracks;\r
+       n = n <= X_AudioSprite_maxTracks ? n : X_AudioSprite_maxTracks;\r
        \r
        // TODO\r
        // Android4.x標準ブラウザ(Chrome系)でブラウザが隠れた場合に音が鳴り続ける問題、ビデオで解決できる?\r
-       //if( X_Audio_Sprite_needTouchAndroid && n === 1 ){\r
+       //if( X_AudioSprite_needTouchAndroid && n === 1 ){\r
        //      video = true;\r
        //};\r
        \r
@@ -71,32 +91,32 @@ X[ 'AudioSprite' ] = function( setting ){
                        v = X_Array_copy( v );\r
                        for( i = v.length; i; ){\r
                                --i;\r
-                               if( i !== 2 ) v[ i ] = X_AudioWrapper_timeStringToNumber( v[ i ] );\r
+                               if( i !== 2 ) v[ i ] = X_Audio_timeStringToNumber( v[ i ] );\r
                        };                                      \r
                        if( v[ 2 ] ) bgms[ k ] = v;\r
                        presets[ k ] = v;\r
                };\r
        };\r
        \r
-       X_Audio_startDetectionBackend( X_Audio_BACKENDS[ 0 ], X_Audio_Sprite_instance, X_Array_copy( urls ), option );\r
+       X_Audio_startDetectionBackend( X_Audio_BACKENDS[ 0 ], X_AudioSprite_instance, X_Array_copy( urls ), option );\r
 \r
-       X_Audio_Sprite_instance[ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE ], X_AudioSprite_backendHandler );\r
-       X_Audio_Sprite_instance[ 'listenOnce' ]( X_EVENT_KILL_INSTANCE, X_Audio_Sprite_handleEvent );\r
+       X_AudioSprite_instance[ 'listenOnce' ]( [ X_EVENT_BACKEND_READY, X_EVENT_BACKEND_NONE ], X_AudioSprite_backendHandler );\r
+       X_AudioSprite_instance[ 'listenOnce' ]( X_EVENT_KILL_INSTANCE, X_AudioSprite_handleEvent );\r
        \r
-       X_Audio_Sprite_useVideo  = video;\r
-       X_Audio_Sprite_numTracks = X_Audio_Sprite_instance[ 'numTracks' ] = n;\r
+       X_AudioSprite_useVideo  = video;\r
+       X_AudioSprite_numTracks = X_AudioSprite_instance[ 'numTracks' ] = n;\r
 \r
-       return X_Audio_Sprite_instance;\r
+       return X_AudioSprite_instance;\r
 };\r
 \r
-X[ 'AudioSprite' ][ 'shouldUse'        ] = X_Audio_Sprite_shouldUse;\r
-X[ 'AudioSprite' ][ 'needTouchFirst'   ] = X_Audio_Sprite_needTouchFirst;\r
-X[ 'AudioSprite' ][ 'enableMultiTrack' ] = !X_Audio_Sprite_disableMultiTrack;\r
+X[ 'AudioSprite' ][ 'shouldUse'        ] = X_AudioSprite_shouldUse;\r
+X[ 'AudioSprite' ][ 'needTouchFirst'   ] = X_AudioSprite_needTouchFirst;\r
+X[ 'AudioSprite' ][ 'enableMultiTrack' ] = !X_AudioSprite_disableMultiTrack;\r
 \r
 // 再生が終わっているもの、終わりかけのものを探す\r
 // TODO 終わりかけのもの、と一番古いもの、どちらを再利用するか?これ以上に細かい実装を望む場合は X.Audio.Sprite は使わず自力で実装\r
-function X_Audio_Sprite_getTrackEnded(){\r
-       var tracks  = X_Audio_Sprite_TEMP.tracks,\r
+function X_AudioSprite_getTrackEnded(){\r
+       var tracks  = X_AudioSprite_TEMP.tracks,\r
                l = tracks.length,\r
                i = 0, track, state, last = 1 / 0, _last, index;\r
        \r
@@ -104,8 +124,8 @@ function X_Audio_Sprite_getTrackEnded(){
                track = tracks[ i ];\r
                state = track.getState();\r
                if( !state.playing ) return track;\r
-               if( track === X_Audio_Sprite_TEMP.bgmTrack ) continue;\r
-               if( state.currentTime <= X_Audio_Sprite_lengthSilence + X_Audio_Sprite_lengthDistance ) return track;\r
+               if( track === X_AudioSprite_TEMP.bgmTrack ) continue;\r
+               if( state.currentTime <= X_AudioSprite_lengthSilence + X_AudioSprite_lengthDistance ) return track;\r
                _last = state.endTime - state.currentTime;\r
                if( _last < last ){\r
                        last  = _last;\r
@@ -115,42 +135,30 @@ function X_Audio_Sprite_getTrackEnded(){
        return tracks[ index ];\r
 };\r
 \r
-/*\r
- * {\r
- *      urls      : [ 'xx.ogg', 'xx.mp3' ],\r
- *      numTracks : 3,\r
- *   useVideo  : false,\r
- *   volume    : 1,\r
- *      BGM_01 : [ '15.00', '45.500', true, '17.666', '50.999' ],\r
- *   BGM_02 : [ '56.00', '1:15.230', true ]\r
- * }\r
- * \r
- * X_EVENT_BACKEND_READY\r
- * X_EVENT_BACKEND_NONE\r
- * \r
- * X_EVENT_READY\r
- * X_EVENT_MEDIA_LOOPED\r
- * X_EVENT_MEDIA_ENDED\r
- * \r
- */\r
-\r
-X_Audio_Sprite_members = {\r
-               \r
+X_AudioSprite_members =\r
+/** @lends X.AudioSprite.prototype */\r
+{\r
+               /**\r
+                * @type {number}\r
+                */\r
                'numTracks' : 0,\r
                \r
+               /**\r
+                * モバイル用タッチイベント中に呼び出す\r
+                */\r
                'load' : function(){\r
-                       var tracks = X_Audio_Sprite_TEMP.tracks,\r
+                       var tracks = X_AudioSprite_TEMP.tracks,\r
                                i = 0, l = tracks.length;\r
 \r
                        for( ; i < l; ++i ){\r
-                               if( X_Audio_Sprite_needTouchAndroid ){\r
+                               if( X_AudioSprite_needTouchAndroid ){\r
                                        console.log( '[duration fix]開始 - ' + tracks[ i ][ '_rawObject' ].duration );\r
-                                       tracks[ i ]._playForDuration = 1;\r
+                                       tracks[ i ]._durationFixPhase = 1;\r
                                        tracks[ i ][ '_rawObject' ].play();\r
                                } else\r
                                if( X_UA[ 'WinPhone' ] ){\r
                                        console.log( 'WinPhone : touch -> play()' );\r
-                                       //tracks[ i ].play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence ).seek( 0 );\r
+                                       //tracks[ i ].play( 0, X_AudioSprite_lengthSilence, true, 0, X_AudioSprite_lengthSilence ).seek( 0 );\r
                                        this[ 'pause' ]( i );\r
                                } else {\r
                                        tracks[ i ][ '_rawObject' ].load();\r
@@ -158,70 +166,72 @@ X_Audio_Sprite_members = {
                        };\r
                },\r
                \r
-               /*\r
+               /**\r
+                * 再生\r
+                * @param {string} name トラック名\r
                 * @return {number} uid\r
                 */\r
                'play' : function( name ){\r
-                       var bgm     = X_Audio_Sprite_TEMP.bgmTrack,\r
-                               tracks  = X_Audio_Sprite_TEMP.tracks,\r
-                               bgms    = X_Audio_Sprite_TEMP.BGMs,\r
-                               presets = X_Audio_Sprite_TEMP.presets,\r
+                       var bgm     = X_AudioSprite_TEMP.bgmTrack,\r
+                               tracks  = X_AudioSprite_TEMP.tracks,\r
+                               bgms    = X_AudioSprite_TEMP.BGMs,\r
+                               presets = X_AudioSprite_TEMP.presets,\r
                                preset  = presets[ name ],\r
                                track, i, k;\r
                        \r
                        if( preset ){\r
                                if( bgms[ name ] ){\r
-                                       if( name !== X_Audio_Sprite_TEMP.bgmName ){\r
+                                       if( name !== X_AudioSprite_TEMP.bgmName ){\r
                                                // bgm変更\r
-                                               X_Audio_Sprite_TEMP.bgmName     = name;\r
-                                               X_Audio_Sprite_TEMP.bgmPosition = preset[ 0 ];\r
-                                               X_Audio_Sprite_TEMP.bgmLooped   = false;\r
+                                               X_AudioSprite_TEMP.bgmName     = name;\r
+                                               X_AudioSprite_TEMP.bgmPosition = preset[ 0 ];\r
+                                               X_AudioSprite_TEMP.bgmLooped   = false;\r
                                        };\r
                                        \r
-                                       X_Audio_Sprite_TEMP.bgmPlaying = true;\r
+                                       X_AudioSprite_TEMP.bgmPlaying = true;\r
                                        \r
                                        if( bgm ){\r
                                                track = bgm;\r
                                        } else\r
                                        if( 1 < tracks.length ){\r
-                                               track = X_Audio_Sprite_TEMP.bgmTrack = X_Audio_Sprite_getTrackEnded();\r
+                                               track = X_AudioSprite_TEMP.bgmTrack = X_AudioSprite_getTrackEnded();\r
                                        } else {\r
-                                               track = X_Audio_Sprite_TEMP.bgmTrack = tracks[ 0 ];\r
+                                               track = X_AudioSprite_TEMP.bgmTrack = tracks[ 0 ];\r
                                        };\r
                                        \r
-                                       if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).playing ){\r
+                                       if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent ).playing ){\r
                                                track.setState({\r
                                                                'loop'          : true,\r
-                                                               'looped'        : X_Audio_Sprite_TEMP.bgmLooped,\r
-                                                               'currentTime'   : X_Audio_Sprite_TEMP.bgmPosition,\r
+                                                               'looped'        : X_AudioSprite_TEMP.bgmLooped,\r
+                                                               'currentTime'   : X_AudioSprite_TEMP.bgmPosition,\r
                                                                'startTime'     : preset[ 0 ],\r
                                                                'endTime'       : preset[ 1 ],\r
                                                                'loopStartTime' : preset[ 3 ],\r
                                                                'loopEndTime'   : preset[ 4 ]\r
                                                        });\r
                                        } else {\r
-                                               track.setState( { 'looped' : X_Audio_Sprite_TEMP.bgmLooped } );\r
+                                               track.setState( { 'looped' : X_AudioSprite_TEMP.bgmLooped } );\r
                                                track.play( preset[ 0 ], preset[ 1 ], true, preset[ 3 ], preset[ 4 ] );\r
-                                               track.seek( X_Audio_Sprite_TEMP.bgmPosition );\r
+                                               track.seek( X_AudioSprite_TEMP.bgmPosition );\r
                                        };\r
                                        \r
                                } else {\r
                                        if( 1 < tracks.length ){\r
-                                               track = X_Audio_Sprite_getTrackEnded( X_Audio_Sprite_TEMP.bgmPlaying );\r
+                                               track = X_AudioSprite_getTrackEnded( X_AudioSprite_TEMP.bgmPlaying );\r
                                                track\r
-                                                       [ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent )\r
+                                                       [ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent )\r
                                                        .setState( { 'looped' : false } );\r
-                                               track.play( preset[ 0 ], preset[ 1 ], true, 0, X_Audio_Sprite_lengthSilence );\r
+                                               track.play( preset[ 0 ], preset[ 1 ], true, 0, X_AudioSprite_lengthSilence );\r
                                        } else {\r
                                                // single track, iOS\r
                                                if( bgm ){\r
-                                                       X_Audio_Sprite_TEMP.bgmPosition = bgm.currentTime();\r
-                                                       //console.log( 'bgm position : ' + X_Audio_Sprite_TEMP.bgmPosition + ' isPlay:' +  bgm.playing );\r
-                                                       X_Audio_Sprite_TEMP.bgmTrack    = null;\r
+                                                       X_AudioSprite_TEMP.bgmPosition = bgm.currentTime();\r
+                                                       //console.log( 'bgm position : ' + X_AudioSprite_TEMP.bgmPosition + ' isPlay:' +  bgm.playing );\r
+                                                       X_AudioSprite_TEMP.bgmTrack    = null;\r
                                                };\r
                                                track = tracks[ 0 ];\r
                                        \r
-                                               if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_Audio_Sprite_handleEvent ).playing ){\r
+                                               if( track[ 'listen' ]( [ X_EVENT_MEDIA_PLAYING, X_EVENT_MEDIA_BEFORE_LOOP ], this, X_AudioSprite_handleEvent ).playing ){\r
                                                        track.setState({\r
                                                                        'loop'          : true,\r
                                                                        'looped'        : false,\r
@@ -229,11 +239,11 @@ X_Audio_Sprite_members = {
                                                                        'startTime'     : preset[ 0 ],\r
                                                                        'endTime'       : preset[ 1 ],\r
                                                                        'loopStartTime' : 0,\r
-                                                                       'loopEndTime'   : X_Audio_Sprite_lengthSilence\r
+                                                                       'loopEndTime'   : X_AudioSprite_lengthSilence\r
                                                                });\r
                                                } else {\r
                                                        \r
-                                                       track.play( preset[ 0 ], preset[ 1 ], true, 0, X_Audio_Sprite_lengthSilence );  \r
+                                                       track.play( preset[ 0 ], preset[ 1 ], true, 0, X_AudioSprite_lengthSilence );   \r
                                                };\r
                                        };\r
                                };\r
@@ -242,44 +252,61 @@ X_Audio_Sprite_members = {
                        return -1;\r
                },\r
                \r
+               /**\r
+                * ポーズ\r
+                * @param {number} uid トラックID\r
+                * @return {number} uid\r
+                */\r
                'pause' : function( uid ){\r
-                       var track = X_Audio_Sprite_TEMP.tracks[ uid ];\r
-                       if( X_Audio_Sprite_TEMP.bgmTrack === track ){\r
-                               X_Audio_Sprite_TEMP.bgmPosition = track.currentTime();\r
-                               X_Audio_Sprite_TEMP.bgmPlaying  = false;\r
-                               X_Audio_Sprite_TEMP.bgmTrack    = null;\r
+                       var track = X_AudioSprite_TEMP.tracks[ uid ];\r
+                       if( X_AudioSprite_TEMP.bgmTrack === track ){\r
+                               X_AudioSprite_TEMP.bgmPosition = track.currentTime();\r
+                               X_AudioSprite_TEMP.bgmPlaying  = false;\r
+                               X_AudioSprite_TEMP.bgmTrack    = null;\r
                        };\r
-                       track && track.play( 0, X_Audio_Sprite_lengthSilence, true, 0, X_Audio_Sprite_lengthSilence );\r
+                       track && track.play( 0, X_AudioSprite_lengthSilence, true, 0, X_AudioSprite_lengthSilence );\r
                        track && track.seek( 0 );\r
                        this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PAUSED );\r
                        return this;\r
                },\r
                \r
+               /**\r
+                * シーク\r
+                * @param {number} uid トラックID\r
+                * @param {number} position ms\r
+                * @return {AudioSprite}\r
+                */\r
                'seek' : function( uid, position ){\r
-                       var track = X_Audio_Sprite_TEMP.tracks[ uid ],\r
+                       var track = X_AudioSprite_TEMP.tracks[ uid ],\r
                                end, strat;\r
                        if( track ){\r
                                delete track.seekTime;\r
-                               end   = X_AudioWrapper_getEndTime( track );\r
-                               start = X_AudioWrapper_getStartTime( track, end );\r
+                               end   = X_Audio_getEndTime( track );\r
+                               start = X_Audio_getStartTime( track, end );\r
                                0 <= position && position <= ( end - start ) && track.seek( start + position );\r
                        };\r
                        return this;\r
                },\r
                \r
+               /**\r
+                * ボリューム\r
+                * @param {number} uid トラックID\r
+                * @param {number} opt_volume= ボリューム\r
+                * @return {AudioSprite|number}\r
+                */\r
                'volume' : function( uid, opt_volume ){\r
                        var track, i;\r
                        // TODO uid = 0\r
                        if( uid === 0 ){\r
                                if( opt_volume === undefined ){\r
-                                       return X_Audio_Sprite_TEMP.volume;\r
+                                       return X_AudioSprite_TEMP.volume;\r
                                };\r
-                               for( i = X_Audio_Sprite_TEMP.tracks.length; i; ){\r
-                                       X_Audio_Sprite_TEMP.tracks[ --i ].volume( opt_volume );\r
+                               for( i = X_AudioSprite_TEMP.tracks.length; i; ){\r
+                                       X_AudioSprite_TEMP.tracks[ --i ].volume( opt_volume );\r
                                };\r
                                return this;\r
                        };\r
-                       track = X_Audio_Sprite_TEMP.tracks[ uid ];\r
+                       track = X_AudioSprite_TEMP.tracks[ uid ];\r
                        if( opt_volume === undefined ){\r
                                return track ? track.gain : -1;\r
                        };\r
@@ -287,8 +314,14 @@ X_Audio_Sprite_members = {
                        return this;\r
                },\r
                \r
+               /**\r
+                * 状態の取得・更新\r
+                * @param {number} uid トラックID\r
+                * @param {object} opt_obj= 上書きする状態を書き込んだオブジェクト\r
+                * @return {AudioSprite|object}\r
+                */\r
                'state' : function( uid, opt_obj ){\r
-                       var track = X_Audio_Sprite_TEMP.tracks[ uid ],\r
+                       var track = X_AudioSprite_TEMP.tracks[ uid ],\r
                                state, start, end;\r
                        // TODO uid = 0\r
                        if( opt_obj === undefined ){\r
@@ -300,10 +333,10 @@ X_Audio_Sprite_members = {
                                        'currentTime' : state.currentTime - start,\r
                                        'playing'     : start <= state.currentTime && state.currentTime <= state.endTime,\r
                                        'duration'    : state.endTime - start,\r
-                                       'volume'      : X_Audio_Sprite_TEMP.volume\r
+                                       'volume'      : X_AudioSprite_TEMP.volume\r
                                        };\r
                                };\r
-                               return { 'volume' : X_Audio_Sprite_TEMP.volume, 'playing' : false };\r
+                               return { 'volume' : X_AudioSprite_TEMP.volume, 'playing' : false };\r
                        };\r
                        track && track.setState( opt_obj );\r
                        return this;\r
@@ -323,15 +356,15 @@ function X_AudioSprite_backendHandler( e ){
                        this[ 'source' ]      = src = e[ 'source' ];\r
                        this[ 'backendName' ] = name = backend.backendName;\r
                \r
-                       //console.log( i + ' / ' + X_Audio_Sprite_numTracks );\r
+                       //console.log( i + ' / ' + X_AudioSprite_numTracks );\r
                \r
-                       for( i = 0; i < X_Audio_Sprite_numTracks; ++i ){\r
-                               if( X_Audio_Sprite_useVideo || ( i === 1 && X_Audio_Sprite_useVideoForMulti ) ){\r
+                       for( i = 0; i < X_AudioSprite_numTracks; ++i ){\r
+                               if( X_AudioSprite_useVideo || ( i === 1 && X_AudioSprite_useVideoForMulti ) ){\r
                                        option[ 'useVideo' ] = true;\r
                                        console.log( 'use video' );\r
                                };\r
                                // Audiobackend の owner として null を渡すとAudioBackend 自身へ dispatch する\r
-                               X_Audio_Sprite_TEMP.tracks.push( last = backend.klass( null, e[ 'source' ], option ) );\r
+                               X_AudioSprite_TEMP.tracks.push( last = backend.klass( null, e[ 'source' ], option ) );\r
                                \r
                                \r
                                //console.dir( backend );\r
@@ -344,7 +377,7 @@ function X_AudioSprite_backendHandler( e ){
                                'backendName' : name\r
                        };\r
                        \r
-                       if( X_Audio_Sprite_needTouchFirst ){\r
+                       if( X_AudioSprite_needTouchFirst ){\r
                                if( name === 'Web Audio' ){\r
                                        _e[ 'needTouchForPlay' ] = true;\r
                                } else {\r
@@ -358,8 +391,8 @@ function X_AudioSprite_backendHandler( e ){
                        last[ 'listenOnce' ]( X_EVENT_READY, this, X_AudioSprite_backendHandler );\r
 \r
                        // READY, needTouchForPlay, needTouchForLoad\r
-                       if( X_HTMLAudio_durationFix && !X_Audio_Sprite_needTouchFirst ){\r
-                               for( i = 0; i < X_Audio_Sprite_TEMP.tracks.length; ++i ){\r
+                       if( X_HTMLAudio_durationFix && !X_AudioSprite_needTouchFirst ){\r
+                               for( i = 0; i < X_AudioSprite_TEMP.tracks.length; ++i ){\r
                                        this[ 'pause' ]( i );\r
                                };\r
                        };\r
@@ -372,8 +405,8 @@ function X_AudioSprite_backendHandler( e ){
                        return X_CALLBACK_STOP_NOW;\r
                \r
                case X_EVENT_READY :\r
-                       if( X_Audio_Sprite_needTouchAndroid ){\r
-                               for( i = 0; i < X_Audio_Sprite_TEMP.tracks.length; ++i ){\r
+                       if( X_AudioSprite_needTouchAndroid ){\r
+                               for( i = 0; i < X_AudioSprite_TEMP.tracks.length; ++i ){\r
                                        this[ 'pause' ]( i );\r
                                };\r
                                e.target[ 'listenOnce' ]( X_EVENT_MEDIA_PLAYING, this, this[ 'asyncDispatch' ], [ X_EVENT_READY ] );\r
@@ -387,17 +420,17 @@ function X_AudioSprite_backendHandler( e ){
 };\r
 \r
 \r
-function X_Audio_Sprite_handleEvent( e ){\r
+function X_AudioSprite_handleEvent( e ){\r
        var i, tracks, track, _e, k;\r
        \r
        switch( e.type ){\r
                case X_EVENT_MEDIA_PLAYING :\r
-                       ( e.target === X_Audio_Sprite_TEMP.bgmTrack || !e.target.looped ) && this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PLAYING );\r
+                       ( e.target === X_AudioSprite_TEMP.bgmTrack || !e.target.looped ) && this[ 'asyncDispatch' ]( X_EVENT_MEDIA_PLAYING );\r
                        break;\r
                \r
                case X_EVENT_MEDIA_BEFORE_LOOP :\r
-                       if( e.target === X_Audio_Sprite_TEMP.bgmTrack ){\r
-                               X_Audio_Sprite_TEMP.bgmLooped = true;\r
+                       if( e.target === X_AudioSprite_TEMP.bgmTrack ){\r
+                               X_AudioSprite_TEMP.bgmLooped = true;\r
                                this[ 'asyncDispatch' ]( X_EVENT_MEDIA_LOOPED ); // TODO uid\r
                        } else {\r
                                if( e.target.looped ){\r
@@ -406,12 +439,12 @@ function X_Audio_Sprite_handleEvent( e ){
                                        this[ 'asyncDispatch' ]( X_EVENT_MEDIA_ENDED ); // TODO uid\r
                                };\r
                                \r
-                               //console.log( '[AudioSprite] bgmPlaying:' + X_Audio_Sprite_TEMP.bgmPlaying + ' ' + !X_Audio_Sprite_TEMP.bgmTrack );\r
+                               //console.log( '[AudioSprite] bgmPlaying:' + X_AudioSprite_TEMP.bgmPlaying + ' ' + !X_AudioSprite_TEMP.bgmTrack );\r
                                \r
                                // single track | iOS\r
-                               if( X_Audio_Sprite_TEMP.bgmPlaying && !X_Audio_Sprite_TEMP.bgmTrack ){\r
-                                       X_Audio_Sprite_TEMP.bgmTrack = e.target;\r
-                                       this.play( X_Audio_Sprite_TEMP.bgmName );\r
+                               if( X_AudioSprite_TEMP.bgmPlaying && !X_AudioSprite_TEMP.bgmTrack ){\r
+                                       X_AudioSprite_TEMP.bgmTrack = e.target;\r
+                                       this.play( X_AudioSprite_TEMP.bgmName );\r
                                        return X_CALLBACK_PREVENT_DEFAULT;\r
                                };\r
                        };\r
@@ -421,41 +454,41 @@ function X_Audio_Sprite_handleEvent( e ){
                case X_EVENT_VIEW_ACTIVATE :\r
                        console.log( '■ アクティブ' );\r
                        // track.play(); or iOS need touch??\r
-                       tracks = X_Audio_Sprite_TEMP.pauseTracks;\r
+                       tracks = X_AudioSprite_TEMP.pauseTracks;\r
                        while( tracks.length ) tracks.pop().actualPlay();\r
                        break;\r
 \r
                case X_EVENT_VIEW_DEACTIVATE :\r
                        console.log( '■ デアクティブ' );\r
                        // track.pause();\r
-                       tracks = X_Audio_Sprite_TEMP.tracks;\r
+                       tracks = X_AudioSprite_TEMP.tracks;\r
                        i      = tracks.length;\r
                        for( ; i; ){\r
                                track = tracks[ --i ];\r
-                               track.playing && X_Audio_Sprite_TEMP.pauseTracks.push( track ) && track.pause();\r
+                               track.playing && X_AudioSprite_TEMP.pauseTracks.push( track ) && track.pause();\r
                        };\r
                        break;\r
                \r
                case X_EVENT_KILL_INSTANCE :\r
                        \r
-                       while( X_Audio_Sprite_TEMP.tracks.length ){\r
-                               X_Audio_Sprite_TEMP.tracks.pop()[ 'kill' ]();\r
+                       while( X_AudioSprite_TEMP.tracks.length ){\r
+                               X_AudioSprite_TEMP.tracks.pop()[ 'kill' ]();\r
                        };\r
                        \r
-                       for( k in X_Audio_Sprite_TEMP.bgms ){\r
-                               delete X_Audio_Sprite_TEMP.bgms[ k ];\r
+                       for( k in X_AudioSprite_TEMP.bgms ){\r
+                               delete X_AudioSprite_TEMP.bgms[ k ];\r
                        };\r
-                       for( k in X_Audio_Sprite_TEMP.presets ){\r
-                               delete X_Audio_Sprite_TEMP.presets[ k ];\r
+                       for( k in X_AudioSprite_TEMP.presets ){\r
+                               delete X_AudioSprite_TEMP.presets[ k ];\r
                        };\r
                        \r
-                       X_Audio_Sprite_TEMP.bgmTrack    = null;\r
-                       X_Audio_Sprite_TEMP.bgmPosition = 0;\r
-                       X_Audio_Sprite_TEMP.bgmName     = '';\r
-                       X_Audio_Sprite_TEMP.bgmLooped   = false;\r
-                       X_Audio_Sprite_TEMP.bgmPlaying  = false;\r
+                       X_AudioSprite_TEMP.bgmTrack    = null;\r
+                       X_AudioSprite_TEMP.bgmPosition = 0;\r
+                       X_AudioSprite_TEMP.bgmName     = '';\r
+                       X_AudioSprite_TEMP.bgmLooped   = false;\r
+                       X_AudioSprite_TEMP.bgmPlaying  = false;\r
                        \r
-                       X_ViewPort[ 'unlisten' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], this, X_Audio_Sprite_handleEvent );\r
+                       X_ViewPort[ 'unlisten' ]( [ X_EVENT_VIEW_ACTIVATE, X_EVENT_VIEW_DEACTIVATE ], this, X_AudioSprite_handleEvent );\r
                        break;\r
        };\r
 };\r