You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2016/03/02 12:50:10 UTC
ambari git commit: AMBARI-15259. Popups are closed in invalid order
(onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk cc5c07fce -> 1c8d7b968
AMBARI-15259. Popups are closed in invalid order (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1c8d7b96
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1c8d7b96
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1c8d7b96
Branch: refs/heads/trunk
Commit: 1c8d7b968a4d57cf9beceee58c4fe3cf29a116ec
Parents: cc5c07f
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Wed Mar 2 09:33:33 2016 +0200
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Wed Mar 2 13:46:04 2016 +0200
----------------------------------------------------------------------
ambari-web/app/views/application.js | 10 ++++-----
.../admin/kerberos/step4_controller_test.js | 23 ++------------------
2 files changed, 7 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c8d7b96/ambari-web/app/views/application.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/application.js b/ambari-web/app/views/application.js
index 2a8ea00..38ca3b5 100644
--- a/ambari-web/app/views/application.js
+++ b/ambari-web/app/views/application.js
@@ -25,15 +25,15 @@ App.ApplicationView = Em.View.extend({
didInsertElement: function () {
// on 'Enter' pressed, trigger modal window primary button if primary button is enabled(green)
// on 'Esc' pressed, close the modal
- $(document).keydown(function(event){
- if (event.which === 13 || event.keyCode === 13 ) {
- $('#modal').trigger('enter-key-pressed');
+ $(document).keydown(function (event) {
+ if (event.which === 13 || event.keyCode === 13) {
+ $('.modal:last').trigger('enter-key-pressed');
}
return true;
});
- $(document).keyup(function(event){
+ $(document).keyup(function (event) {
if (event.which === 27 || event.keyCode === 27) {
- $('#modal').trigger('escape-key-pressed');
+ $('.modal:last').trigger('escape-key-pressed');
}
return true;
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/1c8d7b96/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
index 7d4dbff..e077b30 100644
--- a/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js
@@ -170,15 +170,6 @@ describe('App.KerberosWizardStep4Controller', function() {
Em.Object.create({ name: 'mapreduce_keytab', value: 'mapreduce_keytab_value', serviceName: 'MAPREDUCE2', isEditable: true })
]);
- var propertiesEditableTests = [
- { name: 'spnego_keytab', e: false },
- { name: 'falcon_keytab', e: true },
- { name: 'hdfs_keytab', e: false },
- { name: 'mapreduce_keytab', e: true },
- { name: 'admin_principal', e: true },
- { name: 'admin_password', e: true }
- ];
-
var res;
var controller;
before(function() {
@@ -226,22 +217,12 @@ describe('App.KerberosWizardStep4Controller', function() {
res = controller.get('stepConfigs')[0].get('configs').concat(controller.get('stepConfigs')[1].get('configs'));
});
- var properties = Em.A([
- Em.Object.create({ name: 'realm', value: '', serviceName: 'Cluster' }),
- Em.Object.create({ name: 'spnego_keytab', value: 'spnego_keytab_value', serviceName: 'Cluster', isEditable: true }),
- Em.Object.create({ name: 'hdfs_keytab', value: '', serviceName: 'HDFS', observesValueFrom: 'spnego_keytab', isEditable: true }),
- Em.Object.create({ name: 'falcon_keytab', value: 'falcon_keytab_value', serviceName: 'FALCON', isEditable: true }),
- Em.Object.create({ name: 'mapreduce_keytab', value: 'mapreduce_keytab_value', serviceName: 'MAPREDUCE2', isEditable: true })
- ]);
-
- var propertiesEditableTests = [
+ Em.A([
{ name: 'spnego_keytab', e: false },
{ name: 'falcon_keytab', e: true },
{ name: 'hdfs_keytab', e: false },
{ name: 'mapreduce_keytab', e: true }
- ];
-
- propertiesEditableTests.forEach(function(test) {
+ ]).forEach(function(test) {
it('Add Service: property `{0}` should be {1} editable'.format(test.name, !!test.e ? '' : 'not '), function() {
expect(res.findProperty('name', test.name).get('isEditable')).to.eql(test.e);
});