@bbn/bbn 1.0.188 → 1.0.190
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bbn.js +10 -14
- package/dist/bbn.js.map +1 -1
- package/dist/fn/ajax/_addLoader.d.ts +2 -2
- package/dist/fn/ajax/_addLoader.js +3 -3
- package/dist/fn/ajax/abort.js +4 -7
- package/dist/fn/ajax/ajax.js +3 -4
- package/dist/fn.d.ts +1 -1
- package/package.json +2 -2
package/dist/bbn.js
CHANGED
|
@@ -1219,11 +1219,11 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
1219
1219
|
*
|
|
1220
1220
|
* @param {String} requestId
|
|
1221
1221
|
* @param {Promise} prom
|
|
1222
|
-
* @param {Object}
|
|
1222
|
+
* @param {Object} aborter
|
|
1223
1223
|
*
|
|
1224
1224
|
* @returns {Number} The timestamp (in ms)
|
|
1225
1225
|
*/
|
|
1226
|
-
var _addLoader = function (requestId, prom,
|
|
1226
|
+
var _addLoader = function (requestId, prom, aborter) {
|
|
1227
1227
|
/** @var {Number} tst Current timestamp */
|
|
1228
1228
|
var tst = new Date().getTime();
|
|
1229
1229
|
/** @var {String} url The original URL (part of requestId before : and md5) */
|
|
@@ -1233,7 +1233,7 @@ var _addLoader = function (requestId, prom, source) {
|
|
|
1233
1233
|
key: requestId,
|
|
1234
1234
|
url: url,
|
|
1235
1235
|
loader: prom,
|
|
1236
|
-
|
|
1236
|
+
aborter: aborter,
|
|
1237
1237
|
loading: true,
|
|
1238
1238
|
error: false,
|
|
1239
1239
|
abort: false,
|
|
@@ -1359,15 +1359,12 @@ __webpack_require__.r(__webpack_exports__);
|
|
|
1359
1359
|
*/
|
|
1360
1360
|
var abort = function (requestId) {
|
|
1361
1361
|
var loader = (0,_getLoader_js__WEBPACK_IMPORTED_MODULE_0__.getLoader)(requestId);
|
|
1362
|
-
if (loader
|
|
1363
|
-
|
|
1364
|
-
loader.source.cancel('Operation canceled by the user.');
|
|
1362
|
+
if (loader === null || loader === void 0 ? void 0 : loader.aborter) {
|
|
1363
|
+
loader.aborter.abort('Operation canceled by the user.');
|
|
1365
1364
|
}
|
|
1366
|
-
|
|
1367
|
-
else {
|
|
1365
|
+
else {
|
|
1368
1366
|
throw new Error("Impossible to find the loader " + requestId);
|
|
1369
|
-
|
|
1370
|
-
*/
|
|
1367
|
+
}
|
|
1371
1368
|
};
|
|
1372
1369
|
|
|
1373
1370
|
|
|
@@ -1553,11 +1550,10 @@ var ajax = function (url, datatype, data, success, failure, abort) {
|
|
|
1553
1550
|
if (bbn.env.token) {
|
|
1554
1551
|
(0,_object_extend_js__WEBPACK_IMPORTED_MODULE_4__.extend)(data || {}, { _bbn_token: bbn.env.token });
|
|
1555
1552
|
}
|
|
1556
|
-
var
|
|
1557
|
-
var source = cancelToken.source();
|
|
1553
|
+
var aborter = new AbortController();
|
|
1558
1554
|
var options = {
|
|
1559
1555
|
responseType: datatype,
|
|
1560
|
-
|
|
1556
|
+
signal: aborter.signal
|
|
1561
1557
|
};
|
|
1562
1558
|
if (datatype === "text") {
|
|
1563
1559
|
options['headers'] = {
|
|
@@ -1610,7 +1606,7 @@ var ajax = function (url, datatype, data, success, failure, abort) {
|
|
|
1610
1606
|
}
|
|
1611
1607
|
}
|
|
1612
1608
|
});
|
|
1613
|
-
var tst_1 = (0,_addLoader_js__WEBPACK_IMPORTED_MODULE_8__._addLoader)(requestId_1, loader_1,
|
|
1609
|
+
var tst_1 = (0,_addLoader_js__WEBPACK_IMPORTED_MODULE_8__._addLoader)(requestId_1, loader_1, aborter);
|
|
1614
1610
|
bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
|
|
1615
1611
|
return loader_1;
|
|
1616
1612
|
}
|