@oracle/oraclejet 11.1.5 → 11.1.8

package/dist/css/stable/oj-stable.css

@@ -266,7 +266,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v11.1.5"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v11.1.8"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -12800,7 +12800,7 @@ oj-drawer-popup {
 .oj-drawer-popup-surrogate .oj-drawer-end {
   height: 100vh;
   max-height: 100vh;
-  max-width: 90vh;
+  max-width: 90vw;
   min-width: 320px; }
 
 .oj-drawer-popup-surrogate .oj-drawer-bottom {
@@ -13423,10 +13423,11 @@ oj-form-layout {
   break-inside: avoid;
   page-break-inside: avoid; }
 
-.oj-formlayout-max-cols-1 > .oj-form:not(.oj-formlayout-form-across) {
+.oj-agent-browser-safari .oj-formlayout-max-cols-1 > .oj-form:not(.oj-formlayout-form-across),
+.oj-agent-browser-firefox .oj-formlayout-max-cols-1 > .oj-form:not(.oj-formlayout-form-across) {
   display: inline; }
 
-.oj-form-layout > .oj-form:not(.oj-formlayout-form-across) > .oj-flex {
+.oj-agent-browser-firefox .oj-form-layout > .oj-form:not(.oj-formlayout-form-across) > .oj-flex {
   display: inline; }
 
 .oj-form > hr,
@@ -17344,26 +17345,19 @@ oj-progress-circle {
 
 @keyframes circleLength {
   0% {
-    -webkit-clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0);
-            clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); }
+    clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); }
   6.25% {
-    -webkit-clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0);
-            clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
+    clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
   43.75% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
   50% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 21.1% 100%, 50% 50%, 78.9% 100%, 100% 100%, 100% 0); }
   56.25% {
-    -webkit-clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0);
-            clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
+    clip-path: polygon(0 0, 0 100%, 0 100%, 50% 50%, 100% 100%, 100% 100%, 100% 0); }
   93.75% {
-    -webkit-clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0);
-            clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
+    clip-path: polygon(0 0, 0 0, 0 0, 50% 50%, 100% 0, 100% 0, 100% 0); }
   100% {
-    -webkit-clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0);
-            clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); } }
+    clip-path: polygon(21.1% 0, 21.1% 0, 21.1% 0, 50% 50%, 78.9% 0, 78.9% 0, 78.9% 0); } }
 
 .oj-radiocheckbox-icon {
   padding-inline-end: var(--oj-radio-checkbox-input-to-label-padding);
@@ -19829,28 +19823,49 @@ table.oj-table-element.oj-table-column-header-resizing {
   padding-top: calc(var(--oj-collection-list-cell-padding-vertical) + 1px);
   padding-bottom: var(--oj-collection-list-cell-padding-vertical); }
 
+.oj-table-sticky:not(.oj-table-horizontal-grid) .oj-table-body-row:last-child > .oj-table-data-cell {
+  padding-bottom: calc(var(--oj-collection-list-cell-padding-vertical) + 1px); }
+
+.oj-table-sticky:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:last-child > .oj-table-data-cell.oj-selected {
+  padding-bottom: var(--oj-collection-list-cell-padding-vertical); }
+
 .oj-table-grid-display .oj-table-data-cell {
   padding-top: calc(var(--oj-collection-grid-cell-padding) + 1px);
   padding-bottom: var(--oj-collection-grid-cell-padding); }
 
+.oj-table-sticky.oj-table-grid-display:not(.oj-table-horizontal-grid) .oj-table-body-row:last-child > .oj-table-data-cell {
+  padding-bottom: calc(var(--oj-collection-grid-cell-padding) + 1px); }
+
+.oj-table-sticky.oj-table-grid-display:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:last-child > .oj-table-data-cell.oj-selected {
+  padding-bottom: var(--oj-collection-grid-cell-padding); }
+
 .oj-table-horizontal-grid:not(.oj-table-sticky) .oj-table-body-row:not(:first-child),
 .oj-table-sticky.oj-table-horizontal-grid .oj-table-body-row:not(:first-child) > .oj-table-data-cell,
 .oj-table-sticky.oj-table-horizontal-grid .oj-table-body-row:not(:first-child) > .oj-table-selector-cell {
   border-top: 1px solid var(--oj-core-divider-color); }
 
+.oj-table-sticky.oj-table-horizontal-grid .oj-table-body-row:last-child > .oj-table-data-cell,
+.oj-table-sticky.oj-table-horizontal-grid .oj-table-body-row:last-child > .oj-table-selector-cell {
+  border-bottom: 1px solid var(--oj-core-divider-color); }
+
 /* selection borders for row selection */
-.oj-table:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:not(:first-child) > .oj-table-data-cell.oj-selected,
-.oj-table:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell {
+.oj-table-sticky:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:not(:first-child) > .oj-table-data-cell.oj-selected,
+.oj-table-sticky:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell {
   border-top: 1px solid var(--oj-core-border-color-selected); }
 
+.oj-table-sticky:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:last-child > .oj-table-data-cell.oj-selected {
+  border-bottom: 1px solid var(--oj-core-border-color-selected); }
+
 .oj-table-horizontal-grid .oj-table-data-cell,
 .oj-table:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:not(:first-child) > .oj-table-data-cell.oj-selected,
-.oj-table:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell {
+.oj-table:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell,
+.oj-table-body-row:first-child > .oj-table-data-cell {
   padding-top: var(--oj-collection-list-cell-padding-vertical); }
 
 .oj-table-grid-display.oj-table-horizontal-grid .oj-table-data-cell,
-.oj-table-grid-display:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:not(:first-child) > .oj-table-data-cell.oj-selected,
-.oj-table-grid-display:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell {
+.oj-table.oj-table-grid-display:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected:not(:first-child) > .oj-table-data-cell.oj-selected,
+.oj-table.oj-table-grid-display:not(.oj-table-multiple-row-selection) .oj-table-body-row.oj-selected + .oj-table-body-row > .oj-table-data-cell,
+.oj-table-grid-display .oj-table-body-row:first-child > .oj-table-data-cell {
   padding-top: var(--oj-collection-grid-cell-padding); }
 
 .oj-table-sticky .oj-table-column-header-cell:not(.oj-helper-hidden-accessible),
@@ -20132,6 +20147,10 @@ html[dir="rtl"] .oj-table-frozen-end.oj-table-frozen-edge {
 .oj-table-body-row:first-child {
   height: calc(var(--oj-collection-list-row-height) - 1px); }
 
+.oj-table-sticky .oj-table-body-row:last-child,
+.oj-table-sticky .oj-table-body-row:last-child > .oj-table-data-cell {
+  height: calc(var(--oj-collection-list-row-height) + 1px); }
+
 /* Grid display table styling for the data row elements. */
 .oj-table-grid-display .oj-table-body-row {
   height: var(--oj-collection-grid-row-height); }
@@ -20139,6 +20158,10 @@ html[dir="rtl"] .oj-table-frozen-end.oj-table-frozen-edge {
 .oj-table-grid-display .oj-table-body-row:first-child {
   height: calc(var(--oj-collection-grid-row-height) - 1px); }
 
+.oj-table-sticky.oj-table-grid-display .oj-table-body-row:last-child,
+.oj-table-sticky.oj-table-grid-display .oj-table-body-row:last-child > .oj-table-data-cell {
+  height: calc(var(--oj-collection-grid-row-height) + 1px); }
+
 /* Styling for the data row elements in focus state. */
 .oj-table:not(.oj-table-sticky) .oj-table-element:not(.oj-table-column-header-resizing) .oj-table-body-row.oj-focus-highlight:not(.oj-table-body-row-edit) {
   outline-offset: -1px;

package/dist/js/libs/oj/debug/ojcheckboxset.js

@@ -1168,11 +1168,7 @@ var __oj_checkboxset_metadata =
           }
 
           // if readonly, set tabindex on the wrapper
-          if (this.options.readOnly) {
-            let domElem = this.element[0];
-            let wrapperDom = domElem.querySelector('.oj-checkboxset-wrapper');
-            wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-          }
+          this._updateReadonlyState();
           this._on(this._events);
           this._setup();
         },
@@ -1223,11 +1219,33 @@ var __oj_checkboxset_metadata =
      * @since 5.0.0
      */
         GetFocusElement: function () {
+          // JET-48463 - oj-table issue where focus is lost
+          // GetFocusElement() needs to return the correct readonly element
+          // If _GetReadonlyFocusElement() returns null, fallback to the
+          // enabled element logic.
+          if (this.options.readOnly === true) {
+            const readonlyFocusElement = this._GetReadonlyFocusElement();
+            if (readonlyFocusElement) {
+              return readonlyFocusElement;
+            }
+          }
           // We need :disabled here so that we don't try to focus on an element that isn't focusable.
           // :focusable doesn't work because this is called before the custom element is fully upgraded
           // and is still hidden in the DOM.
           return this._GetContentElement().not(':disabled').first()[0];
         },
+        /**
+         * oj-checkboxset doesn't use .oj-text-field-readonly for the focusable readonly content,
+         * so we need to use a different selector.
+         * @memberof oj.ojCheckboxset
+         * @instance
+         * @override
+         * @protected
+         * @return {Element|null}
+         */
+        _GetReadonlyFocusElement: function () {
+          return this.widget()[0].querySelector('.oj-form-control-container');
+        },
     /**
      * Sets the disabled option onto the dom.
      * This is a no-op for checkboxset since its root dom element is a div, and disabled is
@@ -2053,6 +2071,43 @@ var __oj_checkboxset_metadata =
 
           this.$checkboxes._ojRadioCheckbox('refreshDisabled'); // re-render disabled
         },
+
+        /**
+         * Updates the component's state based on whether or not it is in the readonly
+         * state.
+         * @private
+         * @memberof! oj.ojCheckboxSet
+         */
+         _updateReadonlyState: function () {
+          const wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
+          if (this.options.readOnly) {
+            wrapperDom.setAttribute('tabindex', this._externalTabIndex);
+            this.element.addClass('oj-read-only');
+
+            // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+            // In readonly mode, we will not have any checkbox input in the visible DOM. Thus,
+            // in this state it will just be showing generic text based on the value selected.
+            // So, we need to clean up the role along with the aria-labelledby attributes we added
+            // for that role to make things accessible.
+            this.element.removeAttr('role').removeAttr('aria-labelledby');
+            return;
+          }
+
+          // remove tabindex and role
+          wrapperDom.removeAttribute('tabindex');
+          this.element.removeClass('oj-read-only');
+
+          // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+          // add back the role and aria attributes removed before
+          this.element.attr('role', 'group');
+          this._labelledByUpdatedForSet(
+            this.widget()[0].id,
+            null,
+            this.options.labelledBy,
+            this.widget()
+          );
+        },
+
     /**
      * @override
      * @private
@@ -2068,17 +2123,8 @@ var __oj_checkboxset_metadata =
               break;
             case 'readOnly':
               this.options.readOnly = !!value;
-              var wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
               var val = this.options.value;
-              if (this.options.readOnly) {
-                wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-                this.element.addClass('oj-read-only');
-              } else {
-                // remove tabindex and role
-                wrapperDom.removeAttribute('tabindex');
-                // remove oj-read-only class
-                this.element.removeClass('oj-read-only');
-              }
+              this._updateReadonlyState();
               this._ResetComponentState();
               // when toggle readonly to false, we need to check the initial set values.
               if (val != null) {

package/dist/js/libs/oj/debug/ojcomponentcore.js

@@ -200,6 +200,34 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
     }
   };
 
+  /**
+   * Releases resources that would otherwise leak memory if they were not released
+   * when the component's dom is removed.
+   * For example, Hammer events are put on the document and will result in
+   * detached dom memory leak if not removed.
+   * @private
+   */
+   ComponentMessaging.prototype.releaseResources = function () {
+    if (this._activated) {
+      $.each(this._strategies, function (i, strategy) {
+        strategy.releaseResources();
+      });
+    }
+  };
+
+  /**
+   * Symmetrical method to releaseResources. Sets up resources that get
+   * removed in releaseResources.
+   * @private
+   */
+   ComponentMessaging.prototype.setupResources = function () {
+    if (this._activated) {
+      $.each(this._strategies, function (i, strategy) {
+        strategy.setupResources();
+      });
+    }
+  };
+
   /**
    * Creates a messaging strategy for the specified type, initializing it with the options provided.
    * @param {string|number} type defined by oj.ComponentMessaging._STRATEGY_TYPE. For example,
@@ -752,6 +780,20 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
   MessagingStrategy.prototype.close = function () {
   };
 
+  /**
+   *
+   * @private
+   */
+   MessagingStrategy.prototype.setupResources = function () {
+  };
+
+  /**
+   *
+   * @private
+   */
+   MessagingStrategy.prototype.releaseResources = function () {
+  };
+
   /**
    * Reinitializes with the new display options and updates component messaging using the new content.
    *
@@ -2415,6 +2457,21 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
   CustomElementBridge.proto = Object.create(oj.BaseCustomElementBridge.proto);
   oj._registerLegacyNamespaceProp('CustomElementBridge', CustomElementBridge);
 
+  const getFocusEventPropagator = function (element, type) {
+    return function (event) {
+      // Ensure that the target is the custom element, not the inner element, so create
+      // a new event and dispatch on the custom element.
+      element.dispatchEvent(new FocusEvent(type, { relatedTarget: event.relatedTarget }));
+    };
+  };
+
+  const getTeardownFunction = function (element, focusPropagator, blurPropagator) {
+    return function () {
+      element.removeEventListener('focus', focusPropagator);
+      element.removeEventListener('blur', blurPropagator);
+    };
+  };
+
   oj.CollectionUtils.copyInto(CustomElementBridge.proto, {
     // Provides a promise for JET's Knockout throttling timeout
     // when knockout is used for the component
@@ -2582,18 +2639,7 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
       }
 
       // Setup blur/focus listeners on inner element so we can trigger on the root custom element for 
-      var getFocusEventPropagator = function (type) {
-        return function (event) {
-          // Ensure that the target is the custom element, not the inner element, so create
-          // a new event and dispatch on the custom element.
-          element.dispatchEvent(new FocusEvent(type, { relatedTarget: event.relatedTarget }));
-        };
-      };
-      var focusElem = this._WIDGET_INSTANCE.__getFocusElement();
-      if (focusElem && focusElem !== element) {
-        focusElem.addEventListener('focus', getFocusEventPropagator('focus'));
-        focusElem.addEventListener('blur', getFocusEventPropagator('blur'));
-      }
+      this._setupFocusPropagation(element);
     },
 
     DefineMethodCallback: function (proto, method, methodMeta) {
@@ -2716,12 +2762,16 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
       if (Components.__GetWidgetConstructor(this._WIDGET_ELEM) && this._WIDGET_INSTANCE) {
         this._WIDGET_INSTANCE.__handleDisconnected();
       }
+
+      this._teardownFocusPropagation(element);
     },
 
     HandleReattached: function (element) {
       // Invoke callback on the superclass
       oj.BaseCustomElementBridge.proto.HandleReattached.call(this, element);
 
+      this._setupFocusPropagation(element);
+
       if (this._WIDGET_INSTANCE) {
         this._WIDGET_INSTANCE.__handleConnected();
       }
@@ -2916,6 +2966,25 @@ define(['exports', 'jqueryui-amd/widget', 'jqueryui-amd/unique-id', 'jqueryui-am
         elem[prop] = value;
       }
       return isEvent;
+    },
+
+    _setupFocusPropagation: function (element) {
+      // Setup blur/focus listeners on inner element so we can trigger on the root custom element for 
+      const focusElem = this._WIDGET_INSTANCE.__getFocusElement();
+      if (focusElem && focusElem !== element) {
+        const focusPropagator = getFocusEventPropagator(element, 'focus');
+        const blurPropagator = getFocusEventPropagator(element, 'blur');
+        focusElem.addEventListener('focus', focusPropagator);
+        focusElem.addEventListener('blur', blurPropagator);
+        this._teardownFocus = getTeardownFunction(focusElem, focusPropagator, blurPropagator);
+      }
+    },
+
+    _teardownFocusPropagation: function () {
+      if (this._teardownFocus) {
+        this._teardownFocus();
+        this._teardownFocus = null;
+      }
     }
   });
 

package/dist/js/libs/oj/debug/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '11.1.5',
+    version: '11.1.8',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2022-01-10_12-22-23',
+    revision: '2022-05-03_19-19-55',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate

package/dist/js/libs/oj/debug/ojdatacollection-common.js

@@ -806,6 +806,19 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
     return (bounds.top >= top && bounds.bottom <= bottom);
   };
 
+  /**
+   * Check for SDP-specific internal flag - not a public API
+   */
+  DataCollectionUtils.isIterateAfterDoneNotAllowed = function (dataProvider) {
+    if (dataProvider && dataProvider.getCapability) {
+      var capability = dataProvider.getCapability('fetchFirst');
+      if (capability && capability.iterateAfterDone === 'notAllowed') {
+        return true;
+      }
+    }
+    return false;
+  };
+
   /**
    * Whether browser supports requestIdleCallback
    */
@@ -827,6 +840,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
   const getDefaultScrollBarWidth = DataCollectionUtils.getDefaultScrollBarWidth;
   const getFocusableElementsIncludingDisabled = DataCollectionUtils.getFocusableElementsIncludingDisabled;
   const isElementOrAncestorFocusable = DataCollectionUtils.isElementOrAncestorFocusable;
+  const isIterateAfterDoneNotAllowed = DataCollectionUtils.isIterateAfterDoneNotAllowed;
   const getFocusableElementsInNode = DataCollectionUtils.getFocusableElementsInNode;
   const getLogicalChildPopup = DataCollectionUtils.getLogicalChildPopup;
   const getNoJQFocusHandlers = DataCollectionUtils.getNoJQFocusHandlers;
@@ -889,6 +903,7 @@ define(['exports', 'jquery', 'ojs/ojcore-base', 'ojs/ojdomutils'], function (exp
   exports.isF2KeyEvent = isF2KeyEvent;
   exports.isFromDefaultSelector = isFromDefaultSelector;
   exports.isHomeKeyEvent = isHomeKeyEvent;
+  exports.isIterateAfterDoneNotAllowed = isIterateAfterDoneNotAllowed;
   exports.isLetterAKeyEvent = isLetterAKeyEvent;
   exports.isMobileTouchDevice = isMobileTouchDevice;
   exports.isNumberFiveKeyEvent = isNumberFiveKeyEvent;

package/dist/js/libs/oj/debug/ojdataproviderscroller.js

@@ -2595,20 +2595,6 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
     return referenceNode;
   };
 
-  /**
-   * @private
-   */
-  IteratingDataProviderContentHandler.prototype._isIterateAfterDoneNotAllowed = function () {
-    var dataProvider = this.getDataProvider();
-    if (dataProvider && dataProvider.getCapability) {
-      var capability = dataProvider.getCapability('fetchFirst');
-      if (capability && capability.iterateAfterDone === 'notAllowed') {
-        return true;
-      }
-    }
-    return false;
-  };
-
   /**
    * Gets the maximum index for insert event
    * @private
@@ -2616,7 +2602,8 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
   IteratingDataProviderContentHandler.prototype._getMaxIndexForInsert = function () {
     var max = Number.MAX_VALUE;
     // temporary solution for SDP
-    if (this._isIterateAfterDoneNotAllowed() && !this.hasMoreToFetch()) {
+    if (DataCollectionUtils.isIterateAfterDoneNotAllowed(this.getDataProvider()) &&
+        !this.hasMoreToFetch()) {
       return max;
     }
 
@@ -2664,7 +2651,8 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojconfig',
             index = isBeforeKeys ? index : index + 1;
           } else if (this._isLoadMoreOnScroll()) {
             // if append to the end
-            if (!this._isIterateAfterDoneNotAllowed() || this.hasMoreToFetch()) {
+            if (!DataCollectionUtils.isIterateAfterDoneNotAllowed(this.getDataProvider()) ||
+                this.hasMoreToFetch()) {
               index = max;
             }
           }