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 2016/02/16 19:30:42 UTC
[37/50] [abbrv] ambari git commit: AMBARI-15052. Service delete
confirmation using Enter key doesn't remove service. (alexantonenko)
AMBARI-15052. Service delete confirmation using Enter key doesn't remove service. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c9858260
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c9858260
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c9858260
Branch: refs/heads/branch-dev-patch-upgrade
Commit: c9858260547854f0b1077cdbe09e459ee5a7678b
Parents: 7f3928b
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Feb 16 01:15:15 2016 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Feb 16 11:21:09 2016 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/item.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/c9858260/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 0b8d5d7..a127e92 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -1149,11 +1149,16 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow
bodyClass: Em.View.extend({
confirmKey: confirmKey,
template: Em.Handlebars.compile(message +
- '<form class="form-inline align-center"></br>' +
+ '<div class="form-inline align-center"></br>' +
'<label><b>{{t common.enter}} {{view.confirmKey}}</b></label> ' +
'{{view Ember.TextField valueBinding="view.parentView.confirmInput" class="input-small"}}</br>' +
- '</form>')
- })
+ '</div>')
+ }),
+
+ enterKeyPressed: function(e) {
+ if (this.get('disablePrimary')) return;
+ this.onPrimary();
+ }
});
},