Version 0.6.166, fix X.XHR.GadgetProxy.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 05_XXHRGadget.js

diff --git a/0.6.x/js/06_net/05_XXHRGadget.js b/0.6.x/js/06_net/05_XXHRGadget.js
index d65f2c0..7a9d4d2 100644 (file)
--- a/0.6.x/js/06_net/05_XXHRGadget.js
+++ b/0.6.x/js/06_net/05_XXHRGadget.js
@@ -48,7 +48,7 @@ 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, error, data = null, zero, e;\r
+               iwin, ret, n;\r
        \r
        if( raw ){\r
                iwin = raw.contentWindow || ( raw.contentDocument && raw.contentDocument.parentWindow ) || window.frames[ X_NET_GIMR_iframeName ];\r
@@ -94,45 +94,14 @@ function X_NET_GIMR_detectImageOverIframe(){
                                                        X_NET_GIMR_receivedString = X_Net_GIMR_decodeLocationHash( ret );\r
                                                };\r
 \r
-                                               ret = X_String_parseTrustedJsonString( X_NET_GIMR_receivedString );\r
-                                               \r
-                                               \r
+                                               X_NET_GIMRWrapper[ 'asyncDispatch' ]( X_String_parseTrustedJsonString( X_NET_GIMR_receivedString ) );\r
                                                X_NET_GIMR_receivedString = '';\r
-                                               \r
-                                               error = ret[ 'errors' ] && ret[ 'errors' ].length;\r
-                                               \r
-                                               switch( !error && X_NET_GIMR_requestOriginal[ 'dataType' ] ){\r
-                                                       case 'json' :\r
-                                                               data = X_String_parseTrustedJsonString( ret[ 'json' ] || ret[ 'text' ] || '' );\r
-                                                               break;\r
-                                               };\r
-                                               \r
-                                               //console.dir( data || ret );\r
-                                               \r
-                                               X_NET_GIMRWrapper._busy = false;\r
-                                               \r
-                                               if( error || ret[ 'rc' ] < 200 || 400 < ret[ 'rc' ] ){\r
-                                                       e = {\r
-                                                               type      : X_EVENT_ERROR,\r
-                                                               status    : ret[ 'rc' ] || ret[ 'code' ] || 400,\r
-                                                               'message' : error && ret[ 'errors' ].join( '\n' )\r
-                                                       };\r
-                                               } else {\r
-                                                       e = {\r
-                                                               type      : X_EVENT_SUCCESS,\r
-                                                               status    : ret[ 'rc' ] || 200,\r
-                                                               response  : data\r
-                                                       };\r
-                                               };\r
-                                               \r
-                                               e[ 'headers' ] = ret[ 'headers' ];\r
-                                               \r
-                                               X_NET_GIMRWrapper[ 'asyncDispatch' ]( e );\r
-                                               \r
                                                //console.dir( e );\r
 \r
+                                               X_NET_GIMRWrapper._busy = false;\r
                                                X_NET_GIMR_timerID = X_NET_GIMR_phase = 0;\r
-                                               X_NET_GIMR_lastHashString = '';                                                 \r
+\r
+                                               X_NET_GIMR_lastHashString = '';\r
                                                iwin.location.href = X_NET_GIMR_GADGET_URL + '#_recived_';\r
                                                \r
                                                return X_Callback_UN_LISTEN;\r
@@ -159,8 +128,10 @@ X_TEMP.X_Net_GIMR_init = function(){
                                                        X_JSON_stringify( {\r
                                                                'img'  : X_URL_toAbsolutePath( X_NET_GIMR_IMAGE_URL ),\r
                                                                'len'  : X_NET_GIMR_maxQueryLength,\r
-                                                               'itvl' : 333,\r
-                                                               'gck'  : X_UA[ 'Gecko' ] ? 1 : 0\r
+                                                               'itv'  : 333,\r
+                                                               'gck'  : X_UA[ 'Gecko' ] ? 1 : 0,\r
+                                                               'err'  : X_EVENT_ERROR,\r
+                                                               'suc'  : X_EVENT_SUCCESS\r
                                                        } )\r
                                                ),\r
                                        scrolling         : 'no',\r