Version 0.6.143, fix X.UI.ScrollBox for iOS3.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 00_XNet.js
diff --git a/0.6.x/js/06_net/00_XNet.js b/0.6.x/js/06_net/00_XNet.js

index b9cff54..4d96192 100644 (file)
--- a/0.6.x/js/06_net/00_XNet.js
+++ b/0.6.x/js/06_net/00_XNet.js
@@ -5,12 +5,33 @@
  // <head><base> がある場合、<script>の追加に失敗する\r
  X[ 'Net' ] = {\r
  \r
-       'xhrGet' : function( url, type ){\r
-               return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'GET', url : url, type : type } );\r
+       'xhrGet' : function( url, obj ){\r
+               if( X_Type_isString( url ) ){\r
+                       if( obj ){\r
+                               obj[ 'url' ] = url;\r
+                       } else {\r
+                               obj = { 'url' : url };\r
+                       };\r
+               } else {\r
+                       obj = url;\r
+               };\r
+               obj[ 'method' ] = 'GET';\r
+               return new X_NET_Queue( X_NET_TYPE_XHR, obj );\r
         },\r
         \r
-       'xhrPost' : function( url, type, postbody ){\r
-               return new X_NET_Queue( X_NET_TYPE_XHR, { method : 'POST', url : url, type : type, postbody : postbody } );\r
+       'xhrPost' : function( url, postbody, obj ){\r
+               if( X_Type_isString( url ) ){\r
+                       if( obj ){\r
+                               obj[ 'url' ] = url;\r
+                       } else {\r
+                               obj = { 'url' : url };\r
+                       };\r
+               } else {\r
+                       obj = url;\r
+               };\r
+               obj[ 'method' ] = 'POST';\r
+               obj[ 'postbody' ] = postbody;\r
+               return new X_NET_Queue( X_NET_TYPE_XHR, obj );\r
         },\r
         \r
         'formGet' : function(){\r
@@ -32,6 +53,9 @@ X[ 'Net' ] = {
                 return new X_NET_Queue( X_NET_TYPE_IMAGE, { url : url, needSize : needSize } );\r
         },\r
         \r
+       'gadget' : function( obj ){\r
+               return new X_NET_Queue( 5, obj );\r
+       },\r
         // <script>, <link>\r
         \r
         'amountQueue' : function(){\r
@@ -60,6 +84,7 @@ var X_NET_TYPE_XHR   = 1,
         X_NET_JSONPWrapper,\r
         X_NET_FormWrapper,\r
         X_NET_ImageWrapper,\r
+       X_NET_GIMRWrapper,\r
  \r
         X_NET_currentWrapper,\r
         X_NET_currentQueue;\r
@@ -74,7 +99,7 @@ var X_NET_TYPE_XHR   = 1,
   */\r
  var X_NET_Queue = X_EventDispatcher[ 'inherits' ](\r
                 'XNetQueue',\r
-               X.Class.POOL_OBJECT,\r
+               X_Class.POOL_OBJECT,\r
                 \r
                 /** @lends X_NET_Queue.prototype */\r
                 {\r
@@ -83,7 +108,7 @@ var X_NET_Queue = X_EventDispatcher[ 'inherits' ](
                         \r
                         'Constructor' : function( type, data ){\r
                                 this.type = type;\r
-                               this.data = data;                               \r
+                               this.data = data;\r
                                 \r
                                 //this[ 'listenOnce' ]( X_EVENT_COMPLETE, X_NET_proxyDispatch );\r
                                 X_EventDispatcher_systemListen( this, X_EVENT_COMPLETE, X_NET_proxyDispatch );\r
@@ -156,7 +181,7 @@ function X_NET_shiftQueue(){
                         X_NET_currentWrapper = X_NET_XHRWrapper;\r
                         break;\r
                 case X_NET_TYPE_JSONP :\r
-                       X_NET_currentWrapper = X_NET_JSONPWrapper;\r
+                       X_NET_currentWrapper = X_NET_JSONPWrapper; // X_NET_JSONPWrapper || createJSONPWrapper\r
                         break;\r
                 case X_NET_TYPE_FORM :\r
                         X_NET_currentWrapper = X_NET_FormWrapper;\r
@@ -164,6 +189,9 @@ function X_NET_shiftQueue(){
                 case X_NET_TYPE_IMAGE :\r
                         X_NET_currentWrapper = X_NET_ImageWrapper;\r
                         break;\r
+               case 5 :\r
+                       X_NET_currentWrapper = X_NET_GIMRWrapper;\r
+                       break;\r
         };\r
         \r
         X_NET_currentWrapper[ 'listen' ]( [ X_EVENT_PROGRESS, X_EVENT_SUCCESS, X_EVENT_ERROR, X_EVENT_TIMEOUT, X_EVENT_CANCELED ], X_NET_currentQueue = queue, X_NET_proxyDispatch );\r