@bbn/bbn 1.0.187 → 1.0.189

package/dist/bbn.js

@@ -1219,11 +1219,11 @@ __webpack_require__.r(__webpack_exports__);
  *
  * @param    {String}  requestId
  * @param    {Promise} prom
- * @param    {Object}  source
+ * @param    {Object}  aborter
  *
  * @returns  {Number}  The timestamp (in ms)
  */
-var _addLoader = function (requestId, prom, source) {
+var _addLoader = function (requestId, prom, aborter) {
     /** @var {Number} tst Current timestamp */
     var tst = new Date().getTime();
     /** @var {String} url The original URL (part of requestId before : and md5) */
@@ -1233,7 +1233,7 @@ var _addLoader = function (requestId, prom, source) {
         key: requestId,
         url: url,
         loader: prom,
-        source: source,
+        aborter: aborter,
         loading: true,
         error: false,
         abort: false,
@@ -1359,15 +1359,12 @@ __webpack_require__.r(__webpack_exports__);
  */
 var abort = function (requestId) {
     var loader = (0,_getLoader_js__WEBPACK_IMPORTED_MODULE_0__.getLoader)(requestId);
-    if (loader && loader.source) {
-        //_deleteLoader(requestId);
-        loader.source.cancel('Operation canceled by the user.');
+    if (loader === null || loader === void 0 ? void 0 : loader.aborter) {
+        loader.aborter.abort('Operation canceled by the user.');
     }
-    /*
-      else {
+    else {
         throw new Error("Impossible to find the loader " + requestId);
-      }
-      */
+    }
 };
 
 
@@ -1553,11 +1550,10 @@ var ajax = function (url, datatype, data, success, failure, abort) {
         if (bbn.env.token) {
             (0,_object_extend_js__WEBPACK_IMPORTED_MODULE_4__.extend)(data || {}, { _bbn_token: bbn.env.token });
         }
-        var cancelToken = axios.CancelToken;
-        var source = cancelToken.source();
+        var aborter = new AbortController();
         var options = {
             responseType: datatype,
-            cancelToken: source.token,
+            signal: aborter.signal
         };
         if (datatype === "text") {
             options['headers'] = {
@@ -1610,7 +1606,7 @@ var ajax = function (url, datatype, data, success, failure, abort) {
                 }
             }
         });
-        var tst_1 = (0,_addLoader_js__WEBPACK_IMPORTED_MODULE_8__._addLoader)(requestId_1, loader_1, source);
+        var tst_1 = (0,_addLoader_js__WEBPACK_IMPORTED_MODULE_8__._addLoader)(requestId_1, loader_1, aborter);
         bbn.fn.defaultStartLoadingFunction(url, tst_1, data, requestId_1);
         return loader_1;
     }
@@ -9301,6 +9297,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ });
 /* harmony import */ var _type_isArray_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../type/isArray.js */ "./dist/fn/type/isArray.js");
 /* harmony import */ var _string_hash_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../string/hash.js */ "./dist/fn/string/hash.js");
+/* harmony import */ var _type_isSame_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../type/isSame.js */ "./dist/fn/type/isSame.js");
+/* harmony import */ var _search_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./search.js */ "./dist/fn/object/search.js");
+
+
 
 
 var mutateArray = function (a1, a2) {
@@ -9320,10 +9320,11 @@ var mutateArray = function (a1, a2) {
             a1.splice(i, 1);
         }
     }
-    var _loop_1 = function (j) {
-        if (j >= a1.length || (0,_string_hash_js__WEBPACK_IMPORTED_MODULE_1__.hash)(a1[j]) !== (0,_string_hash_js__WEBPACK_IMPORTED_MODULE_1__.hash)(a1Ordered[j])) {
+    // Insert or move items to match the order of a2
+    for (var j = 0; j < a1Ordered.length; j++) {
+        if ((j >= a1.length) || !(0,_type_isSame_js__WEBPACK_IMPORTED_MODULE_2__.isSame)(a1[j], a1Ordered[j])) {
             // Find the index of the item in a1, if it exists
-            var indexInA1 = a1.findIndex(function (item) { return (0,_string_hash_js__WEBPACK_IMPORTED_MODULE_1__.hash)(item) === (0,_string_hash_js__WEBPACK_IMPORTED_MODULE_1__.hash)(a1Ordered[j]); });
+            var indexInA1 = (0,_search_js__WEBPACK_IMPORTED_MODULE_3__.search)(a1, a1Ordered[j]);
             if (indexInA1 !== -1) {
                 // Move the item to the correct position if it already exists in a1
                 var itemToMove = a1.splice(indexInA1, 1)[0];
@@ -9334,10 +9335,6 @@ var mutateArray = function (a1, a2) {
                 a1.splice(j, 0, a1Ordered[j]);
             }
         }
-    };
-    // Insert or move items to match the order of a2
-    for (var j = 0; j < a1Ordered.length; j++) {
-        _loop_1(j);
     }
     // If a1 has extra items at the end (not present in a2), remove them
     if (a1.length > a1Ordered.length) {