TeaSpeak
/
simple-jsonp-promise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[fix] params serialize

pull/1/head
Ziqiang Li 2017-12-11 14:14:26 +08:00
parent 2ae82c15f8
commit 9b480dd19f
3 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/index.js
View File

@ -46,7 +46,7 @@ function jsonp(url, options) {
}
function serialize(params) {
var param = '?';
var param = '';
for (var key in params) {
if (params.hasOwnProperty(key)) {
param += '&' + key + '=' + encodeURIComponent(params[key]);
@ -55,6 +55,14 @@ function jsonp(url, options) {
return param;
}
function handleUrl(url, params) {
if (!~url.indexOf('?')) {
url += '?';
}
url += serialize(params);
url = url.replace('?&', '?');
}
promise = new Promise(function (resolve, reject) {
if (timeout) {
timer = setTimeout(function () {
@ -67,8 +75,7 @@ function jsonp(url, options) {
resolve(data);
};
params[callback] = id;
url += serialize(params);
url = url.replace('?&', '?');
url = handleUrl(url, params);
// Create script.
script = document.createElement('script');
script.src = url;

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "simple-jsonp-promise",
"version": "1.0.6",
"version": "1.0.7",
"description": "",
"main": "build/index.js",
"scripts": {

59
src/index.js
View File

@ -14,13 +14,13 @@ let count = 0;
* - timeout {Number} how long after the request until a timeout error
* is emitted (defaults to `15000`)
*/
function jsonp( url, options ) {
function jsonp(url, options) {
options = options || {};
let prefix = options.prefix || '__jp';
let callback = options.callback || 'callback';
let params = options.data || {};
let timeout = options.timeout ? options.timeout : 15000;
let target = document.getElementsByTagName( 'script' )[ 0 ] || document.head;
let target = document.getElementsByTagName('script')[0] || document.head;
let script;
let timer;
let promise;
@ -31,46 +31,53 @@ function jsonp( url, options ) {
function cleanup() {
// Remove the script tag.
if ( script && script.parentNode ) {
script.parentNode.removeChild( script );
if (script && script.parentNode) {
script.parentNode.removeChild(script);
}
window[id] = noop;
if (timer) {
clearTimeout(timer);
}
window[ id ] = noop;
if ( timer ) { clearTimeout( timer ); }
}
function serialize( params ) {
let param = '?';
for ( let key in params ) {
if ( params.hasOwnProperty( key ) ) {
function serialize(params) {
let param = '';
for (let key in params) {
if (params.hasOwnProperty(key)) {
param += `&${key}=${encodeURIComponent( params[ key ] )}`;
}
}
return param;
}
promise = new Promise( ( resolve, reject ) => {
if ( timeout ) {
timer = setTimeout( () => {
cleanup();
reject( new Error( 'Timeout' ) );
}, timeout );
function handleUrl(url, params) {
if (!~url.indexOf('?')) { url += '?'; }
url += serialize(params);
url = url.replace('?&', '?');
}
window[ id ] = function( data ) {
promise = new Promise((resolve, reject) => {
if (timeout) {
timer = setTimeout(() => {
cleanup();
resolve( data );
reject(new Error('Timeout'));
}, timeout);
}
window[id] = function (data) {
cleanup();
resolve(data);
};
params[ callback ] = id;
url += serialize( params );
url = url.replace( '?&', '?' );
params[callback] = id;
url = handleUrl(url, params);
// Create script.
script = document.createElement( 'script' );
script = document.createElement('script');
script.src = url;
script.onerror = function() {
script.onerror = function () {
cleanup();
reject( new Error( 'Network Error' ) );
reject(new Error('Network Error'));
};
target.parentNode.insertBefore( script, target );
} );
target.parentNode.insertBefore(script, target);
});
return promise;
}