diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js index f09f42eb12b..3c8a7f5cf2e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/components/timeline-view.js @@ -503,5 +503,9 @@ export default Ember.Component.extend({ prop = 'http://' + prop; } return prop; + }, + + willDestroy: function() { + this.tooltip.remove(); } }); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js index cffe19839ca..a4b9a75bfc5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-app-attempt.js @@ -123,9 +123,8 @@ export default DS.Model.extend({ }.property(), tooltipLabel: function() { - return "
Id:" + this.get("id") + - "
ElapsedTime:" + - String(this.get("elapsedTime")) + "
"; + return "Id: " + this.get("id") + "
" + + "Elapsed time: " + String(this.get("elapsedTime")) + "
"; }.property(), link: function() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js index 7482a2fe998..17053b6f27e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-container.js @@ -57,9 +57,8 @@ export default DS.Model.extend({ }.property(), tooltipLabel: function() { - return "Id:" + this.get("id") + - "
ElapsedTime:" + - String(this.get("elapsedTime")) + "
"; + return "Id: " + this.get("id") + "
" + + "Elapsed time: " + String(this.get("elapsedTime")) + "
"; }.property(), masterNodeURL: function() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js index 9ccf78f912b..27e562d73e0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-appattempt.js @@ -123,9 +123,8 @@ export default DS.Model.extend({ }.property(), tooltipLabel: function() { - return "Id:" + this.get("id") + - "
ElapsedTime:" + - String(this.get("elapsedTime")) + "
"; + return "Id: " + this.get("id") + "
" + + "Elapsed time: " + String(this.get("elapsedTime")) + "
"; }.property(), link: function() { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js index 7482a2fe998..17053b6f27e 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/models/yarn-timeline-container.js @@ -57,9 +57,8 @@ export default DS.Model.extend({ }.property(), tooltipLabel: function() { - return "Id:" + this.get("id") + - "
ElapsedTime:" + - String(this.get("elapsedTime")) + "
"; + return "Id: " + this.get("id") + "
" + + "Elapsed time: " + String(this.get("elapsedTime")) + "
"; }.property(), masterNodeURL: function() {