gd-sprest 9.8.6 → 9.8.8

package/build/rest.js

@@ -6,7 +6,7 @@ import { GraphTypes, SPTypes } from "./sptypes";
  * SharePoint REST Library
  */
 export const $REST = {
-    __ver: 9.86,
+    __ver: 9.88,
     AppContext: (siteUrl) => { return Lib.Site.getAppContext(siteUrl); },
     Apps: Lib.Apps,
     ContextInfo: Lib.ContextInfo,

package/build/utils/request.js

@@ -436,7 +436,7 @@ export const Request = {
             // Parse the requests
             Executor(base.base.batchRequests, batchRequest => {
                 // Do nothing if the stop flag is set
-                if (root.stopFl) {
+                if (root.stopFl || base.stopFl) {
                     return;
                 }
                 // Return a promise
@@ -670,11 +670,9 @@ export const Request = {
             if (isBatchRequest) {
                 // Process the callbacks
                 Batch.processCallbacks(base.base.batchRequests[batchIdx]);
-                // See if the callback for odata query exists
-                if (base.targetInfo.callbackQuery) {
-                    // Call the method
-                    base.targetInfo.callbackQuery(base.base.batchRequests[batchIdx]);
-                }
+                // See if the callback for odata query exists and call the event
+                let callbackQuery = base.targetInfo.callbackQuery || base.base.targetInfo.callbackQuery;
+                callbackQuery ? callbackQuery(base.base.batchRequests[batchIdx]) : null;
             }
         }
     },
@@ -700,16 +698,14 @@ export const Request = {
                     // Set the next item flag
                     base.nextFl = data["@odata.nextLink"] || (data.d && data.d.__next);
                     // See if the callback for odata query exists
-                    if (base.targetInfo.callbackQuery) {
-                        // Call the method
-                        base.targetInfo.callbackQuery(((_a = data.d) === null || _a === void 0 ? void 0 : _a.results) || data.value);
-                    }
+                    let callbackQuery = base.targetInfo.callbackQuery || base.base.targetInfo.callbackQuery;
+                    callbackQuery ? callbackQuery(((_a = data.d) === null || _a === void 0 ? void 0 : _a.results) || data.value) : null;
                     // See if there are more items to get
                     if (base.nextFl) {
                         // Get the root base object
                         let root = Helper.getRootParent(base);
                         // See if we are getting all items in the base request
-                        if (base.getAllItemsFl && root.stopFl != true) {
+                        if (base.getAllItemsFl && (root.stopFl || base.stopFl) != true) {
                             // Create the target information to query the next set of results
                             let targetInfo = Object.create(base.targetInfo);
                             targetInfo.accessToken = base.targetInfo.accessToken || (base.xhr.isGraph ? Graph.Token : null);