Merge branch 'master' of https://github.com/Teradata/kylo

hadoop835 · May 22, 2018 · 8deebfc · 8deebfc
2 parents 3159546 + b466740
commit 8deebfc
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/...s/feed-mgr/visual-query/transform-data/visual-query-table/visual-query-painter.service.ts b/...s/feed-mgr/visual-query/transform-data/visual-query-table/visual-query-painter.service.ts
@@ -130,12 +130,13 @@ export class VisualQueryPainterService extends fattable.Painter {
         });
 
         // Hide tooltip on scroll. Skip Angular change detection.
+       /*
         window.addEventListener("scroll", () => {
             if (this.tooltipVisible) {
                 this.hideTooltip();
             }
-        }, true);
-
+        }, {passive:true, capture:true});
+    */
         // Create menu
         this.menuPanel = $mdPanel.create({
             animation: this.$mdPanel.newPanelAnimation().withAnimation({open: 'md-active md-clickable', close: 'md-leave'}),
@@ -264,16 +265,17 @@ export class VisualQueryPainterService extends fattable.Painter {
      * @param {VisualQueryTableHeader|null} header the column header
      */
     fillHeader(headerDiv: HTMLElement, header: any) {
+
         // Update scope in a separate thread
         const $scope: any = angular.element(headerDiv).scope();
 
         if (header != null && $scope.header !== header && header.delegate != undefined) {
+            $scope.header = header;
+            $scope.table = this.delegate;
             $scope.availableCasts = header.delegate.getAvailableCasts();
             $scope.availableDomainTypes = this.domainTypes;
             $scope.domainType = header.domainTypeId ? this.domainTypes.find((domainType: DomainType) => domainType.id === header.domainTypeId) : null;
-            $scope.header = header;
             $scope.header.unsort = this.unsort.bind(this);
-            $scope.table = this.delegate;
         }
     }
 
@@ -297,6 +299,7 @@ export class VisualQueryPainterService extends fattable.Painter {
      * @param {HTMLElement} cellDiv the cell <div> element
      */
     setupCell(cellDiv: HTMLElement) {
+
         angular.element(cellDiv)
             .on("contextmenu", () => false)
             .on("mousedown", () => this.setSelected(cellDiv))
@@ -316,6 +319,7 @@ export class VisualQueryPainterService extends fattable.Painter {
      * @param {HTMLElement} headerDiv the header <div> element
      */
     setupHeader(headerDiv: HTMLElement) {
+
         // Set style attributes
         headerDiv.style.font = this.headerFont;
         headerDiv.style.lineHeight = VisualQueryPainterService.HEADER_HEIGHT + PIXELS;