Version 0.6.177, bugfix.

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 02_XUA.js

diff --git a/0.6.x/js/01_core/02_XUA.js b/0.6.x/js/01_core/02_XUA.js
index c45d86e..da6f8e2 100644 (file)
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -791,23 +791,6 @@ if( X_UA[ 'Safari' ]  && X_UA[ 'WebKit' ] < 525.13 ){
        };\r
 };*/\r
 \r
-// TODO 構文のサポート instanceof, in, try catch\r
-\r
-if( X_UA[ 'IE' ] < 7 ){ // error @ NN7.2\r
-       X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ?\r
-               document.execCommand && document.execCommand( 'BackgroundImageCache', false, true ) :\r
-               (function(){\r
-                       /**\r
-                        * ie7 以下で実行する document.execCommand( 'BackgroundImageCache', false, true ) の失敗。\r
-                        * bonus: hotfix for IE6 SP1 (bug KB823727)\r
-                        * multipleIEs IE6 standalone 版では不可, IE5.5 は可,,,\r
-                        * @alias X.UA.ieExeComError */\r
-                       X_UA[ 'ieExeComError' ] = eval( 'var a=1;try{document.execCommand&&document.execCommand("BackgroundImageCache",!1,!0)}catch(e){a=0}!a' );\r
-               })();\r
-       \r
-       //X_UA[ 'ieExeComError' ] && alert( 'document.execCommand error!' );\r
-};\r
-\r
 /*\r
  * HTML5 に対応しない IE8 以下でも <a> の下に <div> を作ることができる\r
  * その際に <div> の直前に改行文字が出現するが childNodes は長さ 1 で <div> だけの模様、、、\r
@@ -840,19 +823,19 @@ if( X_UA[ 'IE' ] < 9 && X_Script_VBS_ENABLED ){
                s.text = lines.join( '\n' );\r
                \r
        })( [\r
-                               'Function vba_createAXO(v)',\r
+                               'Function vba_testAXO(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
+                                       'vba_testAXO = 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
+                                       'Set rs = jsFunc(a1,a2,a3,a4)',\r
                                        'If Err.Number != 0 Then',\r
                                                'rs = 0',\r
                                        'End If',\r
@@ -865,26 +848,41 @@ if( X_UA[ 'IE' ] < 9 && X_Script_VBS_ENABLED ){
 };\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
+               return func.apply( {}, args );\r
        };\r
+       return ( new Function( 'f,a', 'try{return f.apply({},a)}catch(e){}' ) )( func, args || [] );\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
+                       console.log( window[ 'vba_testAXO' ]( name ) + ' ' + name );\r
+                       return !window[ 'vba_testAXO' ]( name ) && 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
+       return X_Script_try( X_Script_createActiveXObject, [ name ] );\r
 };\r
 \r
 function X_Script_createActiveXObject( name ){\r
        return new ActiveXObject( name );\r
 };\r
 \r
+// TODO 構文のサポート instanceof, in, try catch\r
+\r
+if( X_UA[ 'IE' ] < 7 ){ // error @ NN7.2\r
+       X_UA[ 'IE4' ] || X_UA[ 'IE5' ] || X_UA[ 'MacIE' ] ?\r
+               document.execCommand && document.execCommand( 'BackgroundImageCache', false, true ) :\r
+               (\r
+                       X_Script_try( function(){ document.execCommand( 'BackgroundImageCache', false, true ); return 1; } ) &&\r
+                               /**\r
+                                * ie7 以下で実行する document.execCommand( 'BackgroundImageCache', false, true ) の失敗。\r
+                                * bonus: hotfix for IE6 SP1 (bug KB823727)\r
+                                * multipleIEs IE6 standalone 版では不可, IE5.5 は可,,,\r
+                                * @alias X.UA.ieExeComError */                 \r
+                               ( X_UA[ 'ieExeComError' ] = true )\r
+                       //eval( 'var a=1;try{document.execCommand&&document.execCommand("BackgroundImageCache",!1,!0)}catch(e){a=0}!a' )\r
+               );\r
+};\r