Version 0.6.135, fix for closure compiler.

[pettanr/clientJs.git] / 0.6.x / js / 07_audio / 02_XHTMLAudio.js

diff --git a/0.6.x/js/07_audio/02_XHTMLAudio.js b/0.6.x/js/07_audio/02_XHTMLAudio.js
index 14aee23..5122880 100644 (file)
--- a/0.6.x/js/07_audio/02_XHTMLAudio.js
+++ b/0.6.x/js/07_audio/02_XHTMLAudio.js
@@ -11,7 +11,7 @@ var X_Audio_HTMLAudio_playTrigger =
                X_UA[ 'AndroidBrowser4' ] ? 'loadeddata' : \r
                X_UA[ 'OperaMobile' ] || X_UA[ 'OperaTablet' ] ? 'loadeddata' : 'canplay',\r
        X_Audio_HTMLAudioWrapper,\r
-       X_Audio_constructor = window.Audio || window.HTMLAudioElement,\r
+       X_Audio_constructor = window[ 'Audio' ] || window.HTMLAudioElement,\r
        X_Audio_rawAudio,\r
        // Opera Mobile 12 android4.4.4 & 2.3.5 は 2回目以降の currentTime へのセットで currentTime が更新されなくなるため、タイマーを使用する\r
        X_Audio_HTMLAudioWrapper_currentTimeFix  = !!X_UA[ 'OperaMobile' ] || !!X_UA[ 'OperaTablet' ], // || ( X_UA[ 'WinPhone' ] && X_UA[ 'IE9' ] ),\r
@@ -40,14 +40,14 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
 \r
        if( X_Audio_rawAudio.canPlayType ){\r
                X_Audio_codecs = {\r
-             mp3  : X_Audio_rawAudio.canPlayType('audio/mpeg'),\r
-             opus : X_Audio_rawAudio.canPlayType('audio/ogg; codecs="opus"'),\r
-             ogg  : X_Audio_rawAudio.canPlayType('audio/ogg; codecs="vorbis"'),\r
-             wav  : X_Audio_rawAudio.canPlayType('audio/wav; codecs="1"'),\r
-             aac  : X_Audio_rawAudio.canPlayType('audio/aac'),\r
-             m4a  : X_Audio_rawAudio.canPlayType('audio/x-m4a') + X_Audio_rawAudio.canPlayType('audio/m4a') + X_Audio_rawAudio.canPlayType('audio/aac'),\r
-             mp4  : X_Audio_rawAudio.canPlayType('audio/x-mp4') + X_Audio_rawAudio.canPlayType('audio/mp4') + X_Audio_rawAudio.canPlayType('audio/aac'),\r
-             weba : X_Audio_rawAudio.canPlayType('audio/webm; codecs="vorbis"')\r
+             'mp3'  : X_Audio_rawAudio.canPlayType('audio/mpeg'),\r
+             'opus' : X_Audio_rawAudio.canPlayType('audio/ogg; codecs="opus"'),\r
+             'ogg'  : X_Audio_rawAudio.canPlayType('audio/ogg; codecs="vorbis"'),\r
+             'wav'  : X_Audio_rawAudio.canPlayType('audio/wav; codecs="1"'),\r
+             'aac'  : X_Audio_rawAudio.canPlayType('audio/aac'),\r
+             'm4a'  : X_Audio_rawAudio.canPlayType('audio/x-m4a') + X_Audio_rawAudio.canPlayType('audio/m4a') + X_Audio_rawAudio.canPlayType('audio/aac'),\r
+             'mp4'  : X_Audio_rawAudio.canPlayType('audio/x-mp4') + X_Audio_rawAudio.canPlayType('audio/mp4') + X_Audio_rawAudio.canPlayType('audio/aac'),\r
+             'weba' : X_Audio_rawAudio.canPlayType('audio/webm; codecs="vorbis"')\r
                };\r
                (function( k, v ){\r
                        for( k in X_Audio_codecs ){\r
@@ -60,19 +60,19 @@ if( X_Audio_constructor && !X_Audio_HTMLAudioWrapper_badOperaAndroid ){
        } else {\r
                // iOS3.2.3\r
                X_Audio_codecs = {\r
-             mp3  : X_UA[ 'IE' ] || X_UA[ 'Chrome' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
-             ogg  : 5 <= X_UA[ 'Gecko' ] || X_UA[ 'Chrome' ] || X_UA[ 'Opera' ] ,\r
-             wav  : X_UA[ 'Gecko' ] || X_UA[ 'Opera' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
-             aac  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
-             m4a  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
-             mp4  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
-             weba : 2 <= X_UA[ 'Gecko' ] || 10.6 <= X_UA[ 'Opera' ] // firefox4+(Gecko2+)\r
+             'mp3'  : X_UA[ 'IE' ] || X_UA[ 'Chrome' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
+             'ogg'  : 5 <= X_UA[ 'Gecko' ] || X_UA[ 'Chrome' ] || X_UA[ 'Opera' ] ,\r
+             'wav'  : X_UA[ 'Gecko' ] || X_UA[ 'Opera' ] || ( X_UA[ 'Windows' ]  && X_UA[ 'Safari' ]  ),\r
+             'aac'  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             'm4a'  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             'mp4'  : X_UA[ 'IE' ] || X_UA[ 'WebKit' ],\r
+             'weba' : 2 <= X_UA[ 'Gecko' ] || 10.6 <= X_UA[ 'Opera' ] // firefox4+(Gecko2+)\r
                };\r
        };\r
        \r
        X_Audio_HTMLAudioWrapper = X_EventDispatcher[ 'inherits' ](\r
                'X.AV.HTML5AudioWrapper',\r
-               X.Class.POOL_OBJECT,\r
+               X_Class.POOL_OBJECT,\r
                {\r
                        \r
                        proxy           : null,\r