External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

set focus on first input in modal when launching jt

Browse Source
This commit is contained in:
Keith Grant
2019-04-02 11:10:02 -04:00
parent e943ae59b7
commit e5f48bfa62
3 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/templates/prompt/prompt.controller.js
View File

@@ -216,6 +216,7 @@ export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings', '$f
} else if(vm.steps[step].tab.order === currentTab.order + 1) { } else if(vm.steps[step].tab.order === currentTab.order + 1) {
vm.steps[step].tab._active = true; vm.steps[step].tab._active = true;
vm.steps[step].tab._disabled = false; vm.steps[step].tab._disabled = false;
scope.$broadcast('promptTabChange', { step });
} }
} }
}); });

6
awx/ui/client/src/templates/prompt/prompt.partial.html
View File

@@ -10,9 +10,9 @@
<div class="Prompt-step"> <div class="Prompt-step">
<div ng-if="vm.steps.inventory.includeStep" ng-show="vm.steps.inventory.tab._active" id="prompt_inventory_step"> <div ng-if="vm.steps.inventory.includeStep" ng-show="vm.steps.inventory.tab._active" id="prompt_inventory_step">
<prompt-inventory <prompt-inventory
prompt-data="vm.promptDataClone" prompt-data="vm.promptDataClone"
read-only-prompts="vm.readOnlyPrompts"> read-only-prompts="vm.readOnlyPrompts">
</prompt-inventory> </prompt-inventory>
</div> </div>
<div ng-if="vm.steps.credential.includeStep" ng-show="vm.steps.credential.tab._active" id="prompt_credential_step"> <div ng-if="vm.steps.credential.includeStep" ng-show="vm.steps.credential.tab._active" id="prompt_credential_step">
<prompt-credential <prompt-credential

18
awx/ui/client/src/templates/prompt/steps/other-prompts/prompt-other-prompts.controller.js
View File

@@ -103,16 +103,26 @@ export default
} }
scope.validate = validate; scope.validate = validate;
angular.element(el).ready(() => { function focusFirstInput () {
const inputs = el.find('input, select'); const inputs = el.find('input[type=text], select, textarea:visible, .CodeMirror textarea');
if (inputs.length) { if (inputs.length) {
inputs.get(0).focus(); inputs.get(0).focus();
} }
}
angular.element(el).ready(() => {
focusFirstInput();
});
scope.$on('promptTabChange', (event, args) => {
if (args.step === 'other_prompts') {
angular.element(el).ready(() => {
focusFirstInput();
});
}
}); });
}; };
vm.toggleDiff = () => { vm.toggleDiff = () => {
scope.promptData.prompts.diffMode.value = !scope.promptData.prompts.diffMode.value; scope.promptData.prompts.diffMode.value = !scope.promptData.prompts.diffMode.value;
}; };