OSDN Git Service

Version 0.6.176, add X.Script.
[pettanr/clientJs.git] / 0.6.x / js / 06_net / 05_XXHRGadget.js
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