You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2014/09/30 22:48:36 UTC
[30/35] git commit: AMBARI-7561. Slider View: App hover being cut
off. (akovalenko)
AMBARI-7561. Slider View: App hover being cut off. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/07e73ca2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/07e73ca2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/07e73ca2
Branch: refs/heads/branch-alerts-dev
Commit: 07e73ca2e90cf253b051b984a311f004536cadde
Parents: b3a9864
Author: Aleksandr Kovalenko <ak...@hortonworks.com>
Authored: Tue Sep 30 20:00:21 2014 +0300
Committer: Aleksandr Kovalenko <ak...@hortonworks.com>
Committed: Tue Sep 30 20:00:21 2014 +0300
----------------------------------------------------------------------
.../src/main/resources/ui/app/templates/application.hbs | 2 +-
.../src/main/resources/ui/app/views/application_view.js | 11 ++++++++---
2 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/07e73ca2/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
index 33633b8..a61b702 100755
--- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
@@ -18,7 +18,7 @@
<div class="slider-header">
{{#view view.SliderTitleView}}
- <h3 class="pull-left"><span class="slider-app-title" {{bs-bind-popover view.popover}}>{{App.label}}</span></h3>
+ <h3 class="pull-left" id="slider-title"><span class="slider-app-title">{{App.label}}</span></h3>
{{#if view.isIndexPage}}
<div class="box-header pull-right">
<div class="create-app">
http://git-wip-us.apache.org/repos/asf/ambari/blob/07e73ca2/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
index e1fea22..e0c866f 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/application_view.js
@@ -32,7 +32,8 @@ App.ApplicationView = Ember.View.extend({
return Em.Object.create({
trigger: 'hover',
placement: 'bottom',
- title: App.get('instance')
+ title: App.get('instance'),
+ html: true
})
}.property('content'),
@@ -49,8 +50,12 @@ App.ApplicationView = Ember.View.extend({
var template = this.createChildView(App.SliderTitleTooltipView, {
content: App.SliderApp.store.all('sliderConfig')
});
- this.set('popover.template', template.renderToBuffer().string());
- }.observes('App.mapperTime')
+ $('#slider-title').data('bs.popover').options.content = template.renderToBuffer().string();
+ }.observes('App.mapperTime'),
+
+ didInsertElement: function () {
+ $('#slider-title').popover(this.get('popover'));
+ }
})