Repository: ambari Updated Branches: refs/heads/branch-1.6.1 3b14a4763 -> de66b43b1
AMBARI-6264. Cannot enter multi-line custom properties.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de66b43b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de66b43b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de66b43b Branch: refs/heads/branch-1.6.1 Commit: de66b43b1423f7bd66ef20be805925c4d4813480 Parents: 3b14a47 Author: Xi Wang <xiw...@apache.org> Authored: Tue Jun 24 14:09:11 2014 -0700 Committer: Xi Wang <xiw...@apache.org> Committed: Tue Jun 24 15:57:29 2014 -0700 ---------------------------------------------------------------------- .../controllers/main/service/manage_config_groups_controller.js | 1 + ambari-web/app/views/application.js | 2 +- ambari-web/app/views/common/configs/services_config.js | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/de66b43b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js index d99c8ab..6e57401 100644 --- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js +++ b/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 = ''; http://git-wip-us.apache.org/repos/asf/ambari/blob/de66b43b/ambari-web/app/views/application.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/application.js b/ambari-web/app/views/application.js index 3d143b5..8a83144 100644 --- a/ambari-web/app/views/application.js +++ b/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(); http://git-wip-us.apache.org/repos/asf/ambari/blob/de66b43b/ambari-web/app/views/common/configs/services_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js index 5e3635c..dfb28e2 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/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(); /**
