Repository: ambari Updated Branches: refs/heads/trunk 7c07dd359 -> 9a72a6009
AMBARI-19047. Select Versions page: 'Remove' tooltip does not disappear (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a72a600 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a72a600 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a72a600 Branch: refs/heads/trunk Commit: 9a72a6009c922f26ee47f2841a5ce89089a24883 Parents: 7c07dd3 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Wed Nov 30 13:19:43 2016 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Thu Dec 1 14:51:46 2016 +0200 ---------------------------------------------------------------------- ambari-web/app/templates/wizard/step1.hbs | 2 +- ambari-web/app/views/wizard/step1_view.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9a72a600/ambari-web/app/templates/wizard/step1.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs index 312898c..5297d12 100644 --- a/ambari-web/app/templates/wizard/step1.hbs +++ b/ambari-web/app/templates/wizard/step1.hbs @@ -165,7 +165,7 @@ </table> </td> <td class="col-sm-1"> - <a class="action" href="#" {{action "removeOS" operatingSystem target="controller"}}> + <a class="action" href="#" {{action "removeOS" operatingSystem target="view"}}> <span class="icon icon-minus" {{translateAttr title="common.remove"}}></span> </a> </td> http://git-wip-us.apache.org/repos/asf/ambari/blob/9a72a600/ambari-web/app/views/wizard/step1_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js index b7a57ca..d5cbbb5 100644 --- a/ambari-web/app/views/wizard/step1_view.js +++ b/ambari-web/app/views/wizard/step1_view.js @@ -51,6 +51,8 @@ App.WizardStep1View = Em.View.extend({ $("[rel=skip-validation-tooltip]").tooltip('destroy'); $("[rel=use-redhat-tooltip]").tooltip('destroy'); $('.add-os-button,.redhat-label').tooltip('destroy'); + $('.icon-undo').tooltip('destroy'); + $('.action .icon').tooltip('destroy'); }, /** @@ -68,6 +70,11 @@ App.WizardStep1View = Em.View.extend({ }); }, + removeOS() { + $('.action .icon').tooltip('destroy'); + return this.get('controller').removeOS(...arguments); + }, + /** * Disable submit button flag *