Comparing version 2.0.16 to 2.0.17
@@ -81,3 +81,4 @@ "use strict"; | ||
}); | ||
return request_1.default($.ajax(settings), config.factory, config.cancelToken); | ||
var promise = request_1.default($.ajax(settings), config.cancelToken); | ||
return config.factory ? promise.then(config.factory) : promise; | ||
}; | ||
@@ -84,0 +85,0 @@ return AbstractRestProvider; |
import CancelToken from "./CancelToken"; | ||
/** | ||
* Promise wrapper over setTimeout function with CancelToken support. Resolves the promise after specified | ||
* period of time. Never rejects the promise. If the operation gets cancelled via the token, the promise never gets | ||
* resolved or rejected. | ||
* @param ms Timeout duration in milliseconds. | ||
* @param cancelToken Cancellation token to bind the operation to. | ||
* @returns Promise object representing the timeout. | ||
*/ | ||
export default function (ms?: number, cancelToken?: CancelToken): Promise<void>; |
@@ -23,2 +23,10 @@ "use strict"; | ||
var CancelToken_1 = require("./CancelToken"); | ||
/** | ||
* Promise wrapper over setTimeout function with CancelToken support. Resolves the promise after specified | ||
* period of time. Never rejects the promise. If the operation gets cancelled via the token, the promise never gets | ||
* resolved or rejected. | ||
* @param ms Timeout duration in milliseconds. | ||
* @param cancelToken Cancellation token to bind the operation to. | ||
* @returns Promise object representing the timeout. | ||
*/ | ||
function default_1(ms, cancelToken) { | ||
@@ -25,0 +33,0 @@ var timeout; |
{ | ||
"name": "jwidget", | ||
"version": "2.0.16", | ||
"version": "2.0.17", | ||
"description": "Object-oriented FrontEnd MV framework", | ||
@@ -5,0 +5,0 @@ "homepage": "http://enepomnyaschih.github.io/jwidget", |
/// <reference types="jquery" /> | ||
import CancelToken from "./CancelToken"; | ||
export default function request<T>(xhr?: JQueryXHR, factory?: (response: any) => T, cancelToken?: CancelToken): Promise<T>; | ||
export default function request(xhr?: JQueryXHR, cancelToken?: CancelToken): Promise<any>; |
@@ -23,8 +23,6 @@ "use strict"; | ||
var CancelToken_1 = require("./CancelToken"); | ||
function request(xhr, factory, cancelToken) { | ||
function request(xhr, cancelToken) { | ||
var aborted = false; | ||
return CancelToken_1.runAsync(function (resolve, reject) { | ||
xhr.then(function (response) { | ||
resolve(factory ? factory(response) : response); | ||
}, function (request) { | ||
xhr.then(resolve, function (request) { | ||
if (!aborted) { | ||
@@ -31,0 +29,0 @@ reject(request); |
@@ -87,3 +87,3 @@ /* | ||
if (url === null) { | ||
return request<T>(); | ||
return request(); | ||
} | ||
@@ -101,3 +101,4 @@ const data = config.data, | ||
}); | ||
return request<T>($.ajax(settings), config.factory, config.cancelToken); | ||
let promise = request($.ajax(settings), config.cancelToken); | ||
return config.factory ? promise.then(config.factory) : promise; | ||
} | ||
@@ -104,0 +105,0 @@ } |
@@ -23,2 +23,10 @@ /* | ||
/** | ||
* Promise wrapper over setTimeout function with CancelToken support. Resolves the promise after specified | ||
* period of time. Never rejects the promise. If the operation gets cancelled via the token, the promise never gets | ||
* resolved or rejected. | ||
* @param ms Timeout duration in milliseconds. | ||
* @param cancelToken Cancellation token to bind the operation to. | ||
* @returns Promise object representing the timeout. | ||
*/ | ||
export default function (ms?: number, cancelToken?: CancelToken) { | ||
@@ -25,0 +33,0 @@ let timeout: number; |
@@ -23,9 +23,7 @@ /* | ||
export default function request<T>(xhr?: JQueryXHR, factory?: (response: any) => T, cancelToken?: CancelToken) { | ||
export default function request(xhr?: JQueryXHR, cancelToken?: CancelToken) { | ||
let aborted = false; | ||
return runAsync<T>( | ||
(resolve: (value?: (Thenable<T> | T)) => void, reject: (error?: any) => void) => { | ||
xhr.then((response) => { | ||
resolve(factory ? factory(response) : response); | ||
}, (request) => { | ||
return runAsync<any>( | ||
(resolve: (value?: (Thenable<any> | any)) => void, reject: (error?: any) => void) => { | ||
xhr.then(resolve, request => { | ||
if (!aborted) { | ||
@@ -32,0 +30,0 @@ reject(request); |
@@ -25,5 +25,5 @@ /* | ||
/** | ||
* Router that creates Components. | ||
* Shorthand for Router<Component>. | ||
*/ | ||
export default class UIRouter extends Router<Component> { | ||
} |
import Component from "./Component"; | ||
import Router from "./Router"; | ||
/** | ||
* Router that creates Components. | ||
* Shorthand for Router<Component>. | ||
*/ | ||
export default class UIRouter extends Router<Component> { | ||
} |
@@ -34,3 +34,3 @@ "use strict"; | ||
/** | ||
* Router that creates Components. | ||
* Shorthand for Router<Component>. | ||
*/ | ||
@@ -37,0 +37,0 @@ var UIRouter = /** @class */ (function (_super) { |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1899072
42033