Repository: ambari Updated Branches: refs/heads/trunk 00bd07866 -> 77bb70603
AMBARI-11152. Graph widget becomes unclickable after the description is shown on hover-wait.(XIWANG) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77bb7060 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77bb7060 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77bb7060 Branch: refs/heads/trunk Commit: 77bb70603d40461b12a57f27dc72ba4929f7898d Parents: 546c919 Author: Xi Wang <xiw...@apache.org> Authored: Thu May 14 17:40:25 2015 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Thu May 14 17:40:50 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/templates/common/widget/graph_widget.hbs | 6 +----- ambari-web/app/templates/main/charts/linear_time.hbs | 7 ++++++- ambari-web/app/views/common/widget/graph_widget_view.js | 3 +++ 3 files changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/77bb7060/ambari-web/app/templates/common/widget/graph_widget.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs b/ambari-web/app/templates/common/widget/graph_widget.hbs index 209e7f8..dd5fd1d 100644 --- a/ambari-web/app/templates/common/widget/graph_widget.hbs +++ b/ambari-web/app/templates/common/widget/graph_widget.hbs @@ -31,11 +31,7 @@ </a> {{/isAccessible}} <div class="content"> {{view view.graphView}}</div> - {{#if view.content.description}} - <div class="hidden-description"> - {{view.content.description}} - </div> - {{/if}} + {{else}} <div class="spinner"></div> {{/if}} http://git-wip-us.apache.org/repos/asf/ambari/blob/77bb7060/ambari-web/app/templates/main/charts/linear_time.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/charts/linear_time.hbs b/ambari-web/app/templates/main/charts/linear_time.hbs index eb36135..bcde4c4 100644 --- a/ambari-web/app/templates/main/charts/linear_time.hbs +++ b/ambari-web/app/templates/main/charts/linear_time.hbs @@ -28,6 +28,11 @@ {{#unless view.noTitleUnderGraph}} <div id="{{unbound view.id}}-title" class="chart-title">{{view.title}}</div> {{/unless}} - </div> +{{#if view.description}} + <div class="hidden-description" {{action showGraphInPopup target="view"}}> + {{view.description}} + </div> +{{/if}} + http://git-wip-us.apache.org/repos/asf/ambari/blob/77bb7060/ambari-web/app/views/common/widget/graph_widget_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/widget/graph_widget_view.js b/ambari-web/app/views/common/widget/graph_widget_view.js index f135636..6c9b9b5 100644 --- a/ambari-web/app/views/common/widget/graph_widget_view.js +++ b/ambari-web/app/views/common/widget/graph_widget_view.js @@ -250,6 +250,9 @@ App.GraphWidgetView = Em.View.extend(App.WidgetMixin, { noTitleUnderGraph: true, inWidget: true, + description: function () { + return this.get('parentView.content.description'); + }.property('parentView.content.description'), /** * set custom time range for graph widget
