Prechádzať zdrojové kódy

AMBARI-6264. Cannot enter multi-line custom properties.(xiwang)

Xi Wang 11 rokov pred
rodič
commit
b37a3624c5

+ 1 - 0
ambari-web/app/controllers/main/service/manage_config_groups_controller.js

@@ -413,6 +413,7 @@ App.ManageConfigGroupsController = Em.Controller.extend({
       warningMessage: '',
       didInsertElement: function(){
         this.validate();
+        this.$('input').focus();
       },
       validate: function () {
         var warningMessage = '';

+ 1 - 1
ambari-web/app/views/application.js

@@ -28,7 +28,7 @@ App.ApplicationView = Em.View.extend({
     $(document).keydown(function(event){
       if (event.which == 13 || event.keyCode == 13 ) {
         var primaryButton = $(document).find('#modal > .modal-footer > .btn-success').last();
-        if (primaryButton.length > 0 && primaryButton.attr('disabled') != 'disabled') {
+        if ((!$("*:focus").is("textarea")) && primaryButton.length > 0 && primaryButton.attr('disabled') != 'disabled') {
           event.preventDefault();
           event.stopPropagation();
           primaryButton.click();

+ 3 - 0
ambari-web/app/views/common/configs/services_config.js

@@ -489,6 +489,9 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
       header: "Add Property",
       primary: 'Add',
       secondary: 'Cancel',
+      didInsertElement: function(){
+        this.$('input').focus();
+      },
       onPrimary: function () {
         serviceConfigObj.observeAddPropertyValue();
         /**