Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(core): blur active element when rendering task monitor #7034

Merged
merged 1 commit into from
May 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/scripts/modules/core/src/task/monitor/TaskMonitor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export class TaskMonitor {
this.task = null;
this.error = false;
this.errorMessage = null;
document.activeElement && (document.activeElement as HTMLElement).blur();
}

public setError(task?: ITask): void {
Expand Down
2 changes: 1 addition & 1 deletion app/scripts/modules/core/src/task/monitor/taskMonitor.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3>{{taskMonitor.title}}</h3>
</div>
</div>
<div class="modal-footer" ng-if="!taskMonitor.error">
<button class="btn btn-primary" ng-click="taskMonitor.closeModal()" autofocus>Close</button>
<button class="btn btn-primary" ng-click="taskMonitor.closeModal()">Close</button>
</div>
<div class="modal-footer" ng-if="taskMonitor.error">
<button class="btn btn-primary" ng-click="taskMonitor.tryToFix()">Go back and try to fix this</button>
Expand Down