AMBARI-15259. Popups are closed in invalid order (onechiporenko)

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;
     });

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);
         });