@oracle/oraclejet 10.1.1 → 10.1.6

package/dist/js/libs/oj/debug_es5/ojtable.js

@@ -42,7 +42,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
           "type": "object",
           "properties": {
             "rowHeader": {
-              "type": "string"
+              "type": "string|Array<string>"
             }
           }
         },
@@ -1849,6 +1849,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     if (isDestroy) {
       // cleanup needed for 'destroy()' call only
       $(this._getTableBody()).removeAttr(ojcomponentcore._OJ_CONTAINER_ATTR);
+      $(this._getTableBody()).removeAttr(Context._OJ_CONTEXT_ATTRIBUTE);
       this.element.children().remove('.' + Table.CSS_CLASSES._TABLE_HEADER_CLASS);
       this.element.children().remove('.' + Table.CSS_CLASSES._TABLE_BODY_CLASS);
       this.element.children().remove('.' + Table.CSS_CLASSES._TABLE_FOOTER_CLASS);
@@ -2009,7 +2010,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
         this._validateInitialSelectionState();
       }
 
-      if (this._resetAriaLabel && this._accRowIndex != null && this._accColumnIndex != null) {
+      if (this._resetAriaLabel && (this._accRowIndex != null && this._accColumnIndex != null || this._accHeaderIndex != null || this._accFooterIndex != null)) {
         this._updateAccStatusInfo(this._accRowIndex, this._accColumnIndex, this._accHeaderIndex, this._accFooterIndex);
       }
 
@@ -2267,7 +2268,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
             var slotContext = this._getHeaderSlotTemplateContextObject(column.headerText, i);
 
-            var headerContent = templateEngine.execute(componentElement, headerSlotTemplate, slotContext, this.options.as);
+            var headerContent = templateEngine.execute(componentElement, headerSlotTemplate, slotContext, this.options.as, headerColumn);
 
             if (!(headerContent instanceof Array)) {
               headerContent = [headerContent];
@@ -2292,7 +2293,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     }
 
     this._renderedTableHeaderColumns = true;
-    return this._finalizeRowRendering([tableHeaderRow]);
+    return this._finalizeNonBodyRowRendering([tableHeaderRow]);
   };
   /**
    * Refresh the table footer
@@ -2393,7 +2394,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
             if (templateEngine != null) {
               var slotContext = this._getFooterSlotTemplateContextObject(i);
 
-              var footerContent = templateEngine.execute(componentElement, footerSlotTemplate, slotContext, this.options.as);
+              var footerContent = templateEngine.execute(componentElement, footerSlotTemplate, slotContext, this.options.as, footerCell);
 
               if (!(footerContent instanceof Array)) {
                 footerContent = [footerContent];
@@ -2417,7 +2418,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       }
     }
 
-    return this._finalizeRowRendering([tableFooterRow]);
+    return this._finalizeNonBodyRowRendering([tableFooterRow]);
   };
   /**
    * Refresh the entire table body with data from the datasource
@@ -2663,9 +2664,11 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
         var templateEngine = this._getTemplateEngine();
 
         if (templateEngine != null) {
-          var slotContext = this._getRowSlotTemplateContextObject(context);
+          var slotContext = this._getRowSlotTemplateContextObject(context); // tableBodyRow may be replaced, so we need to pass in the <tbody> element itself to ensure
+          // busy context parent traversal continues to function correctly
+
 
-          var nodes = templateEngine.execute(componentElement, rowSlotTemplate, slotContext, this.options.as);
+          var nodes = templateEngine.execute(componentElement, rowSlotTemplate, slotContext, this.options.as, tableBody);
 
           for (var i = 0; i < nodes.length; i++) {
             if (nodes[i].tagName === 'TR') {
@@ -2749,8 +2752,8 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     return tableBodyRow;
   };
   /**
-   * Waits for any children components of the given body rows to finish rendering.
-   * Disables any and all focusable elements within those rows if not editable.
+   * Waits for any child components of the table body to finish rendering.
+   * Disables any and all focusable elements within the given rows if not editable.
    * @param {Array<Element>} rowElements the row elements to finalize
    * @returns {Promise}
    * @private
@@ -2758,7 +2761,9 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
 
   Table.prototype._finalizeBodyRowRendering = function (rowElements) {
-    return this._waitForAllBodyElementsToResolve(rowElements).then(function () {
+    var tableBody = this._getTableBody();
+
+    return this._waitForAllElementsToResolve([tableBody]).then(function () {
       var editableRowKey = this._hasEditableRow() ? this._getEditableRowKey() : null;
       rowElements.forEach(function (tableBodyRow) {
         var rowKey = this._getRowKey(tableBodyRow); // disable all focusable content unless this is the current edit row
@@ -2772,15 +2777,15 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     }.bind(this));
   };
   /**
-   * Waits for any children components of the given rows to finish rendering.
-   * Disables any and all focusable elements within those rows.
+   * Waits for any child components of the header or footer row to finish rendering.
+   * Disables any and all focusable elements within the given rows.
    * @param {Array<Element>} rowElements the row elements to finalize
    * @returns {Promise}
    * @private
    */
 
 
-  Table.prototype._finalizeRowRendering = function (rowElements) {
+  Table.prototype._finalizeNonBodyRowRendering = function (rowElements) {
     return this._waitForAllElementsToResolve(rowElements).then(function () {
       rowElements.forEach(function (rowElement) {
         DataCollectionUtils.disableAllFocusableElements(rowElement);
@@ -2788,23 +2793,6 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       return Promise.resolve(true);
     });
   };
-  /**
-   * Returns a Promise which resolves when all JET elements in the array of rows have resolved
-   * @param {Array<Element>} elements Array of DOM elements
-   * @return {Promise} Promise which resolves when all child JET elements have resolved
-   * @private
-   */
-
-
-  Table.prototype._waitForAllBodyElementsToResolve = function (elements) {
-    // Only bother checking if there are templates/renderers defined. If not,
-    // JET elements can't be embedded in the cells so we can skip the check
-    if (elements.length > 0 && this._hasRowOrCellRendererOrTemplate()) {
-      return this._waitForAllElementsToResolve(elements);
-    }
-
-    return Promise.resolve();
-  };
   /**
    * Returns a Promise which resolves when all JET elements in the array have resolved
    * @param {Array<Element>} elements Array of DOM elements
@@ -2816,7 +2804,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
   Table.prototype._waitForAllElementsToResolve = function (elements) {
     var busyContextPromiseArray = [];
     elements.forEach(function (element) {
-      // Only wait on busyContext of non-null row elements. Otherwise, busy state lock can occur
+      // Only wait on busyContext of non-null elements. Otherwise, busy state lock can occur
       if (element) {
         busyContextPromiseArray.push(Context.getContext(element).getBusyContext().whenReady());
       }
@@ -3103,7 +3091,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
         var templateEngine = this._getTemplateEngine();
 
         if (templateEngine != null) {
-          var nodes = templateEngine.execute(this._getRootElement(), noDataTemplate, {}, null);
+          var nodes = templateEngine.execute(this._getRootElement(), noDataTemplate, {}, null, tableBody);
           nodes.forEach(function (node) {
             noDataContentCell.appendChild(node); // @HTMLUpdateOK
           });
@@ -3725,7 +3713,8 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
         var sortIcon = this._getSortIcon(tableHeaderColumn);
 
         if (sortContainer != null && sortIcon != null) {
-          sortContainer.setAttribute('title', this.getTranslatedString('labelSortAsc'));
+          sortContainer.setAttribute(Table.DOM_ATTR._TITLE, this.getTranslatedString('labelSortAsc')); // @HTMLUpdateOK
+
           sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_DSC_ICON_CLASS);
           sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_ASC_ICON_CLASS);
           sortIcon.classList.add(Table.CSS_CLASSES._COLUMN_HEADER_DEFAULT_SORT_ICON_CLASS);
@@ -3791,7 +3780,8 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       $(tableHeaderColumn).data('sorted', Table._COLUMN_SORT_ORDER._ASCENDING);
 
       if (sortIcon != null) {
-        sortContainer.setAttribute('title', this.getTranslatedString('labelSortDsc'));
+        sortContainer.setAttribute(Table.DOM_ATTR._TITLE, this.getTranslatedString('labelSortDsc')); // @HTMLUpdateOK
+
         sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_DEFAULT_SORT_ICON_CLASS);
         sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_DSC_ICON_CLASS);
         sortIcon.classList.add(Table.CSS_CLASSES._COLUMN_HEADER_ASC_ICON_CLASS);
@@ -3801,7 +3791,8 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       $(tableHeaderColumn).data('sorted', Table._COLUMN_SORT_ORDER._DESCENDING);
 
       if (sortIcon != null) {
-        sortContainer.setAttribute('title', this.getTranslatedString('labelSortAsc'));
+        sortContainer.setAttribute(Table.DOM_ATTR._TITLE, this.getTranslatedString('labelSortAsc')); // @HTMLUpdateOK
+
         sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_DEFAULT_SORT_ICON_CLASS);
         sortIcon.classList.remove(Table.CSS_CLASSES._COLUMN_HEADER_ASC_ICON_CLASS);
         sortIcon.classList.add(Table.CSS_CLASSES._COLUMN_HEADER_DSC_ICON_CLASS);
@@ -8467,11 +8458,24 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
     contextInfo.id = this.createSubId('context');
     contextInfo.classList.add(Table.CSS_CLASSES._TABLE_ACC_CONTEXT_INFO_CLASS);
-    contextInfo.classList.add(Table.CSS_CLASSES._HIDDEN_CONTENT_ACC_CLASS);
+    contextInfo.classList.add(Table.CSS_CLASSES._HIDDEN_CONTENT_ACC_CLASS); // row context info
+
+    var rowContext = document.createElement(Table.DOM_ELEMENT._DIV); // @HTMLUpdateOK
+
+    rowContext.id = this.createSubId('rowContext');
+    rowContext.classList.add(Table.CSS_CLASSES._HIDDEN_CONTENT_ACC_CLASS);
+    contextInfo.appendChild(rowContext); // column context info
+
+    var columnContext = document.createElement(Table.DOM_ELEMENT._DIV); // @HTMLUpdateOK
+
+    columnContext.id = this.createSubId('columnContext');
+    columnContext.classList.add(Table.CSS_CLASSES._HIDDEN_CONTENT_ACC_CLASS);
+    contextInfo.appendChild(columnContext);
 
     this._getTableContainer().appendChild(contextInfo);
 
-    this._contextInfo = contextInfo;
+    this._rowContextInfo = rowContext;
+    this._columnContextInfo = columnContext;
     return contextInfo;
   };
   /**
@@ -8533,10 +8537,10 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
     if (headerIndex != null) {
       // update column header context information
-      this._contextInfo.textContent = this.getTranslatedString('accessibleColumnHeaderContext', {
+      this._columnContextInfo.textContent = this.getTranslatedString('accessibleColumnHeaderContext', {
         index: headerIndex + 1
       });
-      label += this._contextInfo.id + ' ';
+      label += this._columnContextInfo.id + ' ';
 
       if (headerIndex === -1) {
         // handle select all column header case
@@ -8581,10 +8585,10 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       label += tableHeaderColumn.id + ' ' + this._stateInfo.id;
     } else if (footerIndex != null) {
       // update column footer context information
-      this._contextInfo.textContent = this.getTranslatedString('accessibleColumnFooterContext', {
+      this._columnContextInfo.textContent = this.getTranslatedString('accessibleColumnFooterContext', {
         index: footerIndex + 1
       });
-      label += this._contextInfo.id + ' ';
+      label += this._columnContextInfo.id + ' ';
       var tableFooterCell;
 
       if (footerIndex === -1) {
@@ -8615,22 +8619,22 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
       label += tableFooterCell.id + ' ' + this._stateInfo.id;
     } else {
-      // update row / column context information if changed
-      this._contextInfo.textContent = '';
-
+      // update row context information if changed
       if (rowIndex !== this._accRowIndex) {
-        this._contextInfo.textContent += this.getTranslatedString('accessibleRowContext', {
+        this._rowContextInfo.textContent = this.getTranslatedString('accessibleRowContext', {
           index: rowIndex + 1
         }) + ' ';
-      }
+        label += this._rowContextInfo.id + ' ' + this._getRowHeaderIds(rowIndex);
+      } // update column context information if changed
+
 
       if (columnIndex !== this._accColumnIndex) {
-        this._contextInfo.textContent += this.getTranslatedString('accessibleColumnContext', {
+        this._columnContextInfo.textContent = this.getTranslatedString('accessibleColumnContext', {
           index: columnIndex + 1
         });
-      }
+        label += this._columnContextInfo.id + ' ';
+      } // populate cell information
 
-      label += this._contextInfo.id + ' '; // populate cell information
 
       var tableBodyCellElements = this._getTableElementsByClassName(this._getTableBodyRow(rowIndex), Table.CSS_CLASSES._TABLE_DATA_CELL_CLASS);
 
@@ -8781,6 +8785,50 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
     this._applyAccStatusLabel(label);
   };
+  /**
+   * @private
+   */
+
+
+  Table.prototype._getRowHeaderIds = function (rowIndex) {
+    var rowHeaderCell;
+    var rowHeaderIds = '';
+    var accessibility = this.options.accessibility;
+
+    if (accessibility != null && accessibility.rowHeader != null) {
+      var rowHeaders = accessibility.rowHeader;
+
+      if (!Array.isArray(rowHeaders)) {
+        rowHeaders = [rowHeaders];
+      }
+
+      var columnDefs = this._getColumnDefs();
+
+      for (var i = 0; i < rowHeaders.length; i++) {
+        var headerColumnId = rowHeaders[i];
+
+        for (var j = 0; j < columnDefs.length; j++) {
+          if (headerColumnId === columnDefs[j].id) {
+            rowHeaderCell = this._getTableBodyCell(rowIndex, j);
+
+            if (rowHeaderCell != null) {
+              rowHeaderIds += rowHeaderCell.id + ' ';
+            }
+
+            break;
+          }
+        }
+      }
+    } else {
+      rowHeaderCell = this._getTableBodyCell(rowIndex, 0);
+
+      if (rowHeaderCell != null) {
+        rowHeaderIds += rowHeaderCell.id + ' ';
+      }
+    }
+
+    return rowHeaderIds;
+  };
   /**
    * @license
    * Copyright (c) 2014, 2021, Oracle and/or its affiliates.
@@ -9549,10 +9597,6 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       // be called right before we're ready to update the UI.  If we call it
       // outside of this queued task, the DOM may have changed from other
       // data operations, and the row index can be wrong.
-      var tableBody = this._getTableBody();
-
-      var checkFocus = $.contains(tableBody, document.activeElement);
-
       var rows = this._getRowsFromEventDetailChange(eventDetail);
 
       if (rows.length === 0) {
@@ -9564,17 +9608,26 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
       var rowsCount = rows.length;
       var updatedTableBodyRows = [];
       var rowIdxArray = [];
+      var resetFocus = false;
 
       for (var i = 0; i < rowsCount; i++) {
-        var tableBodyRow = this._refreshTableBodyRow(rows[i].rowIdx, rows[i].row);
+        var row = rows[i]; // if existing (stale) row contains focus, reset focus to overall table element
+
+        var staleRow = this._getTableBodyRow(row.rowIdx);
+
+        if (staleRow != null && staleRow !== document.activeElement && staleRow.contains(document.activeElement)) {
+          resetFocus = true;
+        }
+
+        var tableBodyRow = this._refreshTableBodyRow(row.rowIdx, row.row);
 
         if (tableBodyRow) {
           updatedTableBodyRows.push(tableBodyRow);
-          rowIdxArray.push(rows[i].rowIdx);
+          rowIdxArray.push(row.rowIdx);
         }
       }
 
-      if (checkFocus) {
+      if (resetFocus) {
         this._getTable().focus();
       } // row values may have changed so refresh the footer
 
@@ -12320,6 +12373,8 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     tableBody.classList.add(Table.CSS_CLASSES._TABLE_BODY_CLASS); // Add a special marker attribute to tell child components that they are container within table
 
     tableBody.setAttribute(ojcomponentcore._OJ_CONTAINER_ATTR, this.widgetName); // @HTMLUpdateOK
+
+    tableBody.setAttribute(Context._OJ_CONTEXT_ATTRIBUTE, ''); // @HTMLUpdateOK
   };
   /**
    * Style the td element
@@ -12363,8 +12418,6 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
 
 
   Table.prototype._styleTableBodyRow = function (tableBodyRow, isNew) {
-    tableBodyRow.setAttribute(Context._OJ_CONTEXT_ATTRIBUTE, ''); // @HTMLUpdateOK
-
     if (isNew || !tableBodyRow.classList.contains(Table.CSS_CLASSES._TABLE_DATA_ROW_CLASS)) {
       tableBodyRow.classList.add(Table.CSS_CLASSES._TABLE_DATA_ROW_CLASS);
     }
@@ -15025,11 +15078,7 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
           return false;
         }
 
-        if (this._accColumnIndex == null) {
-          this._accColumnIndex = 0;
-        }
-
-        this._updateAccStatusInfo(rowIdx, this._accColumnIndex);
+        this._updateAccStatusInfo(rowIdx, this._accColumnIndex != null ? this._accColumnIndex : 0);
       }
 
       focusedRowIdx = this._getFocusedRowIdx();
@@ -17382,7 +17431,9 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     var sortContainer = document.createElement(Table.DOM_ELEMENT._DIV); // @HTMLUpdateOK
 
     sortContainer.classList.add(Table.CSS_CLASSES._TABLE_SORT_ICON_CONTAINER_CLASS);
-    sortContainer.setAttribute('title', this.getTranslatedString('labelSortAsc'));
+    sortContainer.setAttribute(Table.DOM_ATTR._TITLE, this.getTranslatedString('labelSortAsc')); // @HTMLUpdateOK
+
+    sortContainer.setAttribute(Table.DOM_ATTR._ARIA_HIDDEN, 'true'); // @HTMLUpdateOK
 
     this._AddHoverable($(sortContainer));
 
@@ -17540,9 +17591,11 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
         var templateEngine = this._getTemplateEngine();
 
         if (templateEngine != null) {
+          var tableBody = this._getTableBody();
+
           var slotContext = this._getCellSlotTemplateContextObject(rendererContext);
 
-          var cellContent = templateEngine.execute(componentElement, cellSlotTemplate, slotContext, this.options.as);
+          var cellContent = templateEngine.execute(componentElement, cellSlotTemplate, slotContext, this.options.as, tableBody);
 
           if (!(cellContent instanceof Array)) {
             cellContent = [cellContent];
@@ -20089,22 +20142,20 @@ define(['touchr', 'ojdnd', 'ojs/ojeditablevalue', 'ojs/ojinputnumber', 'ojs/ojme
     accessibility: null,
 
     /**
-     * The column id to be used as the row header by screen readers.
+     * The column ids to be used as the row headers by screen readers. This can be a string if there is only one
+     * column id, or an array of strings if multiple column ids are desired.
      *
-     * <p>The td cells in the column specified by this
-     * attribute will be assigned an id and then referenced by the
-     * headers attribute in the rest of the cells in the row.
-     * This is required by screen readers. By default the first column
+     * <p>This is required by screen readers. By default the first column
      * will be taken as the row header.</p>
      * <p>See the <a href="#accessibility">accessibility</a> attribute for usage examples.</p>
      *
      * @expose
      * @name accessibility.rowHeader
-     * @ojshortdesc Specifies the column id to be used as the row header by screen readers. See the Help documentation for more information.
+     * @ojshortdesc Specifies the column ids to be used as the row headers by screen readers. See the Help documentation for more information.
      * @memberof! oj.ojTable
      * @instance
      * @public
-     * @type {string}
+     * @type {string | Array.<string>}
      */
 
     /**

package/dist/js/libs/oj/debug_es5/ojtabs.js

@@ -2214,15 +2214,15 @@ define(['ojs/ojcore', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojdomutils', 'ojs/oj
           $(this).css('max-width', '').removeClass('oj-tabs-title-overflow');
         }); //      this._logMessage("remove max width");
       },
-      _logMessage: function _logMessage()
-      /* msg */
-      {//      console.log(msg);
+      _logMessage: function
+        /* msg */
+      _logMessage() {//      console.log(msg);
       },
 
       /* resize handler */
-      _handleResize: function _handleResize()
-      /* width */
-      {
+      _handleResize: function
+        /* width */
+      _handleResize() {
         //      this._logMessage("width " + width + " ulWidth " + this._originalWidth +
         //                       " clientWidth " + this._getTabsWidth());
         //  - truncation=none tabs + buttons are not laid out correctly.

package/dist/js/libs/oj/debug_es5/ojtemplateengine.js

@@ -31,10 +31,11 @@ define(['knockout', 'ojs/ojcore', 'ojs/ojkoshared', 'ojs/ojhtmlutils', 'ojs/ojvd
      * @param {Element} templateElement the <template> element
      * @param {Oject} properties data to be applied to the template
      * @param {string} alias an alias for referencing the data within a template
+     * @param {Element} reportBusy - optional element for bubblng busy states outside of the template
      * @return {Array.<Node>} HTML nodes representing the result of the execution
      * @ignore
      */
-    this.execute = function (componentElement, templateElement, properties, alias) {
+    this.execute = function (componentElement, templateElement, properties, alias, reportBusy) {
       // Check to see if data-oj-as was defined on the template element as an additional
       // alias to provide to the template children
       var templateAlias = templateElement.getAttribute('data-oj-as');
@@ -47,7 +48,7 @@ define(['knockout', 'ojs/ojcore', 'ojs/ojkoshared', 'ojs/ojhtmlutils', 'ojs/ojvd
         return this._executeVDomTemplate(templateElement, context);
       }
 
-      var tmpContainer = _createAndPopulateContainer(templateElement);
+      var tmpContainer = _createAndPopulateContainer(templateElement, reportBusy);
 
       ko.applyBindingsToDescendants(context, tmpContainer);
       return Array.prototype.slice.call(tmpContainer.childNodes, 0);
@@ -342,8 +343,13 @@ define(['knockout', 'ojs/ojcore', 'ojs/ojkoshared', 'ojs/ojhtmlutils', 'ojs/ojvd
       return complexVal;
     }
 
-    function _createAndPopulateContainer(node) {
+    function _createAndPopulateContainer(node, reportBusy) {
       var div = document.createElement('div');
+
+      if (reportBusy) {
+        div._ojReportBusy = reportBusy;
+      }
+
       var nodes = HtmlUtils.getTemplateContent(node);
 
       for (var i = 0; i < nodes.length; i++) {

package/dist/js/libs/oj/debug_es5/ojthematicmap-toolkit.js

@@ -3553,42 +3553,42 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
       event.preventDefault();
     } // Selection
     else if (keyCode == dvt.KeyboardEvent.SPACE && event.ctrlKey) {
-        this.SetClickInfo(focusObj);
-        this.ProcessSelectionEventHelper(focusObj, true);
+      this.SetClickInfo(focusObj);
+      this.ProcessSelectionEventHelper(focusObj, true);
+      event.preventDefault();
+    } // Zoom to fit
+    else if ((keyCode == dvt.KeyboardEvent.ZERO || keyCode == dvt.KeyboardEvent.NUMPAD_ZERO) && event.ctrlKey) {
+      if (event.altKey) this._tmap.fitRegion(focusDisp);else this._tmap.fitSelectedRegions();
+      event.preventDefault();
+    } // Mashups
+    else if (keyCode == dvt.KeyboardEvent.TAB && focusDisp instanceof DvtCustomDataItem) {
+      // If displayable is already focused, then tab enters stamp and all future events pass to stamp until shift+tab
+      // or tab out
+      if (!event.shiftKey && focusObj.isShowingKeyboardFocusEffect()) {
+        focusObj.hideKeyboardFocusEffect();
+        focusDisp.fireKeyboardListener(event);
         event.preventDefault();
-      } // Zoom to fit
-      else if ((keyCode == dvt.KeyboardEvent.ZERO || keyCode == dvt.KeyboardEvent.NUMPAD_ZERO) && event.ctrlKey) {
-          if (event.altKey) this._tmap.fitRegion(focusDisp);else this._tmap.fitSelectedRegions();
-          event.preventDefault();
-        } // Mashups
-        else if (keyCode == dvt.KeyboardEvent.TAB && focusDisp instanceof DvtCustomDataItem) {
-            // If displayable is already focused, then tab enters stamp and all future events pass to stamp until shift+tab
-            // or tab out
-            if (!event.shiftKey && focusObj.isShowingKeyboardFocusEffect()) {
-              focusObj.hideKeyboardFocusEffect();
-              focusDisp.fireKeyboardListener(event);
-              event.preventDefault();
-              this._bPassOnEvent = true;
-            } // If stamp is focused, shift+tab will move focus back to thematic map
-            else if (event.shiftKey && this._bPassOnEvent) {
-                this.ShowFocusEffect(event, focusObj);
-                event.preventDefault();
-                this._bPassOnEvent = false;
-              } // All other tab cases should be handled by superclass and will move focus out of component
-              else {
-                  if (this._bPassOnEvent) focusObj.showKeyboardFocusEffect(); // checked by superclass to tab out of component
-
-                  eventConsumed = DvtThematicMapEventManager.superclass.ProcessKeyboardEvent.call(this, event);
-                  this._bPassOnEvent = false;
-                }
-          } else {
-            if (keyCode == dvt.KeyboardEvent.TAB && focusObj) {
-              //make sure focused obj in on screen
-              this._tmap.ensureObjInViewport(event, focusObj);
-            }
+        this._bPassOnEvent = true;
+      } // If stamp is focused, shift+tab will move focus back to thematic map
+      else if (event.shiftKey && this._bPassOnEvent) {
+        this.ShowFocusEffect(event, focusObj);
+        event.preventDefault();
+        this._bPassOnEvent = false;
+      } // All other tab cases should be handled by superclass and will move focus out of component
+      else {
+        if (this._bPassOnEvent) focusObj.showKeyboardFocusEffect(); // checked by superclass to tab out of component
 
-            eventConsumed = DvtThematicMapEventManager.superclass.ProcessKeyboardEvent.call(this, event);
-          }
+        eventConsumed = DvtThematicMapEventManager.superclass.ProcessKeyboardEvent.call(this, event);
+        this._bPassOnEvent = false;
+      }
+    } else {
+      if (keyCode == dvt.KeyboardEvent.TAB && focusObj) {
+        //make sure focused obj in on screen
+        this._tmap.ensureObjInViewport(event, focusObj);
+      }
+
+      eventConsumed = DvtThematicMapEventManager.superclass.ProcessKeyboardEvent.call(this, event);
+    }
 
     return eventConsumed;
   };
@@ -6331,14 +6331,14 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
         startPt = startMarker.getCenter();
       } // Check areas if no marker with id matches
       else {
-          startMarker = idToAreaMap.get(startLoc['id']);
+        startMarker = idToAreaMap.get(startLoc['id']);
 
-          if (startMarker) {
-            startPt = this._getPtFromLocation(dataLayer, {
-              'location': startMarker.getLocation()
-            });
-          }
+        if (startMarker) {
+          startPt = this._getPtFromLocation(dataLayer, {
+            'location': startMarker.getLocation()
+          });
         }
+      }
     } else {
       startPt = this._getPtFromLocation(dataLayer, startLoc);
     }
@@ -6353,14 +6353,14 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
         endPt = endMarker.getCenter();
       } // Check areas if no marker with id matches
       else {
-          endMarker = idToAreaMap.get(endLoc['id']);
+        endMarker = idToAreaMap.get(endLoc['id']);
 
-          if (endMarker) {
-            endPt = this._getPtFromLocation(dataLayer, {
-              'location': endMarker.getLocation()
-            });
-          }
+        if (endMarker) {
+          endPt = this._getPtFromLocation(dataLayer, {
+            'location': endMarker.getLocation()
+          });
         }
+      }
     } else {
       endPt = this._getPtFromLocation(dataLayer, endLoc);
     } // Return null if both a start and end point are not determined
@@ -6676,8 +6676,8 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
       // DvtMapObjPeer, we're doing the instanceof check after the more specific DvtMapAreaPeer check so
       // we can assume this means that we are currently in the marker data layer.
       else if (focusObj instanceof DvtMapObjPeer) {
-          navigables = this._tmap.getNavigableLinks();
-        }
+        navigables = this._tmap.getNavigableLinks();
+      }
 
       if (navigables.length > 0) {
         focusObj = dvt.KeyboardHandler.getNextAdjacentNavigable(focusObj, event, navigables);
@@ -6703,8 +6703,8 @@ define(['exports', 'ojs/ojdvt-toolkit', 'ojs/ojdvt-panzoomcanvas'], function (ex
       // DvtMapObjPeer, we're doing the instanceof check after the more specific DvtMapAreaPeer check so
       // we can assume this means that we are currently in the marker data layer.
       else if (!(focusObj instanceof DvtMapAreaPeer) && focusObj instanceof DvtMapObjPeer) {
-          navigables = this._tmap.getNavigableAreas();
-        }
+        navigables = this._tmap.getNavigableAreas();
+      }
 
       if (navigables.length > 0) {
         focusObj = dvt.KeyboardHandler.getNextAdjacentNavigable(focusObj, event, navigables);

package/dist/js/libs/oj/debug_es5/ojtreedataprovideradapter.js

@@ -13,7 +13,7 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }