Version 0.6.158, fix X.Net.JSONP.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 02_XNetJSONP.js

diff --git a/0.6.x/js/06_net/02_XNetJSONP.js b/0.6.x/js/06_net/02_XNetJSONP.js
index 7b1c4da..6918382 100644 (file)
--- a/0.6.x/js/06_net/02_XNetJSONP.js
+++ b/0.6.x/js/06_net/02_XNetJSONP.js
@@ -66,10 +66,22 @@ X_TEMP.X_NET_JSONP_params = {
                        load : function( option ){
                                //createURL
                                var url           = option[ 'url' ],
-                                       json2Path     = 'js/libs/json2.js',
+                                       params        = option[ 'params' ],
+                                       callback      = option[ 'callbackName' ],
+                                       charset       = option[ 'charset' ],
+                                       json2Path     = window.RegExp ? 'js/libs/json2.js' : 'js/libs/json2_regfree.js',
                                        json2FileSize = 18103,
                                        html;
                                
+                               url = X_URL_create( url, params );
+                               
+                               if( !callback && !( callback = X_URL_ParamToObj( url.split( '?' )[ 1 ] )[ 'callback' ] ) ){
+                                       url += '&callback=cb';
+                                       callback = 'cb';
+                               };
+                               
+                               charset = charset ? ' charset="' + charset + '"' : '';
+                               
                                // TODO '<scr'+'ipt> 化　恐らくアンチウイルスソフトが反応しないための対策
                                // document.postMessage()→window.postMessage() (Opera 9.50 build 9841 -)
                                // http://d.hatena.ne.jp/cnrd/20080518/1211099169
@@ -81,9 +93,9 @@ X_TEMP.X_NET_JSONP_params = {
                                                '<script>',
                                                        'onunload=function(){im.onload=im.onerror=""};',
                                                        'nw=+new Date;',
-                                                       'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
+                                                       'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw', window[ 'JSON' ] ? json2FileSize : 0 ,');nw=0}}',
                                                '</script>',    
-                                               '<script id="jp"></script>',
+                                               '<script', charset, ' id="jp"></script>',
                                                '<img id="im" src="', url, '" onload="jp.src=im.src" onerror="jp.src=im.src">'
                                        ];
                                        X_Net_JSONP_maxOnloadCount = 2;
@@ -96,19 +108,19 @@ X_TEMP.X_NET_JSONP_params = {
                                                // http://blog.livedoor.jp/dankogai/archives/51503830.html              
                                                // Ajax - IE8にもJSON入ってます。使えるとは限らないけど
                                                // Compatibility mode (別名Quirks mode) では、JSONオブジェクトは無効になります。iframeもだめです
-                                               '<script id="jp"></script>',
+                                               '<script', charset, ' id="jp"></script>',
                                                '<script>',
                                                        'onunload=function(){clearTimeout(id)};',
                                                        'nw=0;', // なぜか必要,,,
-                                                       'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),-nw)}',
-                                                       //'function cb(o){if(nw){nw-=+new Date;postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',                   
+                                                       'function ', callback, '(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),-nw)}',
+                                                       //'function ', callback, '(o){if(nw){nw-=+new Date;postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+parent.JSON.stringify(o).replace(/\\\\u([a-fA-F0-9]{4})/g,function(a,b){return String.fromCharCode(parseInt(b,16))}),"*");nw=0}}',                       
                                                        'function tm(){jp.src="', url ,'";nw=+new Date}',
                                                        'id=setTimeout(tm,16);',
                                                '</script>'
                                                
                                                /*　以下のコードは XP ie8 では動くけど、win8 IE11(8モード)で動かない 開発の便宜を取って,setTimeout を挟む
                                                '<script>',
-                                                       'function cb(o){window.parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
+                                                       'function ', callback, '(o){window.parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',window.parent.JSON.stringify(o))}',
                                                '</script>',
                                                '<script src="', url, '"></script>' */
                                        ];
@@ -116,10 +128,10 @@ X_TEMP.X_NET_JSONP_params = {
                                } else
                                if( X_UA[ 'IE9' ] ){
                                        html = [
-                                               '<script id="jp"></script>',
+                                               '<script', charset, ' id="jp"></script>',
                                                '<script>',
                                                        'onunload=function(){clearTimeout(id)};',
-                                                       'function cb(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
+                                                       'function ', callback, '(o){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw)}',
                                                        'function tm(){jp.src="', url ,'";nw=+new Date}',
                                                        'id=setTimeout(tm,16);',
                                                '</script>'
@@ -130,20 +142,20 @@ X_TEMP.X_NET_JSONP_params = {
                                        html = [        
                                                '<script>',
                                                        'nw=+new Date;',
-                                                       'function cb(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
-                                                       //'function cb(o){if(nw){nw-=+new Date;parent.postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
+                                                       'function ', callback, '(o){if(nw){nw-=+new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw);nw=0}}',
+                                                       //'function ', callback, '(o){if(nw){nw-=+new Date;parent.postMessage("', X_NET_JSONP_SEND_MSG_KEY,' "+nw+"|"+JSON.stringify(o),"', location.origin, '");nw=0}}',
                                                '</script>',
-                                               '<script src="', url, '"></script>'
+                                               '<script', charset, ' src="', url, '"></script>'
                                        ];
                                        X_Net_JSONP_maxOnloadCount = 1;
                                } else
                                if( X_UA[ 'IE4' ] || X_UA[ 'MacIE' ] ){
                                        html = [
                                                '<script id="jn"></script>',
-                                               '<script id="jp"></script>',
+                                               '<script', charset, ' id="jp"></script>',
                                                '<script>',
                                                        'onunload=function(){clearTimeout(id)};',
-                                                       'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+                                                       'function ', callback, '(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
                                                        'function t1(){document.all.jn.src="', json2Path ,'";id=setTimeout("t2()",16);nw=+new Date}',
                                                        'id=setTimeout("t1()",16);',
                                                        'function t2(){if(window.JSON){document.all.jp.src="', url ,'"}else{id=setTimeout("t2()",16)}}',
@@ -154,10 +166,10 @@ X_TEMP.X_NET_JSONP_params = {
                                if( X_UA[ 'IE' ] < 8 ){ // ie5-7
                                        html = [
                                                '<script id="jn"></script>',
-                                               '<script id="jp"></script>',
+                                               '<script', charset, ' id="jp"></script>',
                                                '<script>',
                                                        'onunload=function(){clearTimeout(id)};',
-                                                       'function cb(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
+                                                       'function ', callback, '(o){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw-16,', json2FileSize, ')}',
                                                        'function t1(){jn.src="', json2Path ,'";id=setTimeout(t2,16);nw=+new Date}',
                                                        'id=setTimeout(t1,16);',
                                                        'function t2(){if(window.JSON){jp.src="', url ,'"}else{id=setTimeout(t2,16)}}',
@@ -167,11 +179,11 @@ X_TEMP.X_NET_JSONP_params = {
                                } else {
                                        html = [
                                                '<script>',
-                                                       'function cb(o){if(nw){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
+                                                       'function ', callback, '(o){if(nw){nw-=new Date;parent.X.Net.JSONP.cb(' + X_NET_JSONP_ACCESS_KEY + ',JSON.stringify(o),-nw,', json2FileSize, ');nw=0}}',
                                                        'nw=+new Date;',
                                                '</script>',
                                                '<script src="', json2Path, '"></script>',
-                                               '<script src="', url, '"></script>'
+                                               '<script', charset, ' src="', url, '"></script>'
                                        ];
                                        X_Net_JSONP_maxOnloadCount = 2;
                                };