Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E1B8010267 for ; Fri, 13 Feb 2015 18:53:57 +0000 (UTC) Received: (qmail 26872 invoked by uid 500); 13 Feb 2015 18:53:57 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 26834 invoked by uid 500); 13 Feb 2015 18:53:57 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 26825 invoked by uid 99); 13 Feb 2015 18:53:57 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Feb 2015 18:53:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 921A9E05DA; Fri, 13 Feb 2015 18:53:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hitesh@apache.org To: commits@tez.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: tez git commit: TEZ-2101. Tez UI: Issues on displaying a table. (Sreenath Somarajapuram via hitesh) Date: Fri, 13 Feb 2015 18:53:57 +0000 (UTC) Repository: tez Updated Branches: refs/heads/master 6f0825d0f -> ada11cc4d TEZ-2101. Tez UI: Issues on displaying a table. (Sreenath Somarajapuram via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/ada11cc4 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/ada11cc4 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/ada11cc4 Branch: refs/heads/master Commit: ada11cc4d4bfe65706d412f66a6e86a012f22e64 Parents: 6f0825d Author: Hitesh Shah Authored: Fri Feb 13 10:53:02 2015 -0800 Committer: Hitesh Shah Committed: Fri Feb 13 10:53:02 2015 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + tez-ui/src/main/webapp/app/scripts/helpers/misc.js | 2 ++ tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js | 6 +++++- tez-ui/src/main/webapp/app/styles/main.less | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/ada11cc4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index ec631b3..9f33a85 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -62,6 +62,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2101. Tez UI: Issues on displaying a table. TEZ-2092. Tez UI history url handler injects spurious trailing slash. TEZ-2098. Tez UI: Dag details should be the default page for dag, fix invalid time entries for failed Vertices. TEZ-2024. TaskFinishedEvent may not be logged in recovery. http://git-wip-us.apache.org/repos/asf/tez/blob/ada11cc4/tez-ui/src/main/webapp/app/scripts/helpers/misc.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js index 1bbb677..50663a8 100644 --- a/tez-ui/src/main/webapp/app/scripts/helpers/misc.js +++ b/tez-ui/src/main/webapp/app/scripts/helpers/misc.js @@ -17,6 +17,8 @@ App.Helpers.misc = { getStatusClassForEntity: function(dag) { + if(!dag) return ''; + var st = dag.get('status'); switch(st) { case 'FAILED': http://git-wip-us.apache.org/repos/asf/tez/blob/ada11cc4/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js b/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js index f576edf..749be3a 100644 --- a/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js +++ b/tez-ui/src/main/webapp/app/scripts/views/dag-view-view.js @@ -29,7 +29,11 @@ App.DagViewView = Ember.View.extend({ }, didInsertElement: function() { - $(window).resize(this.setHeight.bind(this)); + $(window).on('resize', this.setHeight); this.setHeight(); }, + + willDestroyElement: function () { + $(window).off('resize', this.setHeight); + } }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tez/blob/ada11cc4/tez-ui/src/main/webapp/app/styles/main.less ---------------------------------------------------------------------- diff --git a/tez-ui/src/main/webapp/app/styles/main.less b/tez-ui/src/main/webapp/app/styles/main.less index 2730af6..161c8f3 100644 --- a/tez-ui/src/main/webapp/app/styles/main.less +++ b/tez-ui/src/main/webapp/app/styles/main.less @@ -455,7 +455,7 @@ div.indent { } .table-container { - min-height: 100px; + min-height: 20px; width: 100%; overflow: auto; border-right: 1px solid @border-lite;