Skip to content

Commit 16773ce

Browse files
committed
feat(taskList): refocus last task after notes were edited
1 parent 4ce1a1a commit 16773ce

File tree

4 files changed

+18
-17
lines changed

4 files changed

+18
-17
lines changed

app-src/scripts/dialogs/help/help-task-list.html

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ <h3 class="md-title">An interactive example task</h3>
4848
<md-button class="md-icon-button play-btn"
4949
aria-label="mark as current"
5050
tabindex="2"
51-
ng-click="$ctrl.isCurrent= !$ctrl.isCurrent">
51+
ng-click="vm.isCurrent= !vm.isCurrent">
5252
<md-tooltip>
5353
Starts time tracking for the task and marks it as current task. Will only appear on the work view.
5454
</md-tooltip>
55-
<ng-md-icon icon="{{$ctrl.isCurrent? 'pause_circle_filled':'play_circle_fill'}}"
55+
<ng-md-icon icon="{{vm.isCurrent? 'pause_circle_filled':'play_circle_fill'}}"
5656
aria-label="start task"></ng-md-icon>
5757
</md-button>
5858

@@ -81,8 +81,7 @@ <h3 class="md-title">An interactive example task</h3>
8181
<md-button class="md-icon-button"
8282
tabindex="2"
8383
ng-disabled="vm.exampleTask.subTasks.length>0"
84-
aria-label="time estimation"
85-
ng-click="$ctrl.estimateTime(task)">
84+
aria-label="time estimation">
8685
<md-tooltip>
8786
Opens a dialog for you to specify time spend and time estimated for the task
8887
</md-tooltip>
@@ -135,7 +134,6 @@ <h3 class="md-title">An interactive example task</h3>
135134
</md-tooltip>
136135
<md-checkbox ng-model="vm.exampleTask.isDone"
137136
tabindex="2"
138-
ng-change="$ctrl.onTaskDoneChanged(task)"
139137
aria-label="un-/mark as done">
140138
</md-checkbox>
141139
</span>
@@ -181,8 +179,7 @@ <h3 class="md-title">An interactive example task</h3>
181179
<md-tooltip>
182180
Notes section. Click to edit.
183181
</md-tooltip>
184-
<inline-markdown ng-model="vm.exampleTask.notes"
185-
on-changed="$ctrl.onTaskNotesChanged(task)"></inline-markdown>
182+
<inline-markdown ng-model="vm.exampleTask.notes"></inline-markdown>
186183
</div>
187184
</section>
188185

app-src/scripts/inline-markdown/inline-markdown-d.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
restrict: 'E',
2323
scope: {
2424
ngModel: '=',
25-
onChanged: '&'
25+
onEditFinished: '&'
2626
}
2727
};
2828
}
@@ -88,15 +88,17 @@
8888
vm.showEdit = false;
8989
makeLinksWorkForElectron();
9090
vm.resizeToFit();
91+
const isChanged = (ngModelCopy !== vm.ngModel);
9192

92-
if (ngModelCopy !== vm.ngModel) {
93+
if (isChanged) {
9394
vm.ngModel = ngModelCopy;
95+
}
9496

95-
if (angular.isFunction(vm.onChanged)) {
96-
vm.onChanged({
97-
newVal: ngModelCopy
98-
});
99-
}
97+
if (angular.isFunction(vm.onEditFinished)) {
98+
vm.onEditFinished({
99+
newVal: vm.ngModel,
100+
isChanged: isChanged
101+
});
100102
}
101103
};
102104

app-src/scripts/task-list/task-list-d.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
ng-bind="task.originalId ? 'Description': 'Notes'"></div>
156156
<div md-whiteframe="4">
157157
<inline-markdown ng-model="task.notes"
158-
on-changed="$ctrl.onTaskNotesChanged(newVal, task)"></inline-markdown>
158+
on-edit-finished="$ctrl.onTaskNotesEditFinished(newVal, isChanged, task)"></inline-markdown>
159159
</div>
160160
</section>
161161

app-src/scripts/task-list/task-list-d.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,14 @@
183183
}
184184
}
185185

186-
onTaskNotesChanged(newNoteVal, task) {
187-
if (task.originalKey) {
186+
onTaskNotesEditFinished(newNoteVal, isChanged, task) {
187+
if (task.originalKey && isChanged) {
188188
// for some reason, this isn't updated for the task, so we do it here once more
189189
task.notes = newNoteVal;
190190
this.Jira.updateIssueDescription(task);
191191
}
192+
193+
this.focusLastFocusedTaskEl();
192194
}
193195

194196
onTaskDoneChanged(task) {

0 commit comments

Comments
 (0)