Skip to content

Commit 752c5b6

Browse files
committed
Removed polymorphic trackAll usage
1 parent edeed75 commit 752c5b6

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

src/js/controllers/remindersInboxCtrl.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,8 @@ angular.module('starter').controller('RemindersInboxCtrl', ["$scope", "$state",
278278
refreshIfRunningOutOfNotifications();
279279
return n;
280280
};
281-
$scope.track = function(n, value, $ev, trackAll){ // Keep trackAll param because it's used in templates/items/notification-item.html
281+
$scope.track = function(n, value, $ev){ // Keep trackAll param because it's used in templates/items/notification-item.html
282282
if(isGhostClick($ev)){return false;}
283-
if(trackAll){
284-
return $scope.trackAll(n, value, $ev);
285-
}
286283
n.action = 'track';
287284
n.modifiedValue = value;
288285
var valueUnit = qm.stringHelper.formatValueUnitDisplayText(n.modifiedValue + ' ' + n.unitAbbreviatedName);

src/templates/items/notification-value-input-buttons.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<img id="{{'numericRatingOptions' + option.numericValue}}"
1212
ng-repeat="option in numericRatingOptions"
1313
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
14-
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
14+
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
1515
title="{{option.numericValue}}/5"
1616
ng-src="{{option.img}}">
1717
</div>
@@ -23,7 +23,7 @@
2323
<img id="{{'positiveRatingOptions' + option.numericValue}}"
2424
ng-repeat="option in positiveRatingOptions"
2525
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
26-
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
26+
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
2727
title="{{option.numericValue}}/5"
2828
ng-src="{{option.img}}">
2929
</div>
@@ -35,7 +35,7 @@
3535
<img id="{{'negativeRatingOptions' + option.numericValue}}"
3636
ng-repeat="option in negativeRatingOptions"
3737
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
38-
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
38+
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
3939
title="{{option.numericValue}}/5"
4040
ng-src="{{option.img}}">
4141
</div>
@@ -48,13 +48,13 @@
4848
<button class="button button-assertive"
4949
style="text-overflow: clip; font-size: 14px;"
5050
on-hold="trackAllWithConfirmation(trackingReminderNotification, 0, $event)"
51-
ng-click="track(trackingReminderNotification, 0, $event, trackAll)">
51+
ng-click="track(trackingReminderNotification, 0, $event)">
5252
<i class="ion-android-done"> &nbsp; NO &nbsp</i>
5353
</button>
5454
<button class="button button-balanced"
5555
style="text-overflow: clip; font-size: 14px;"
5656
on-hold="trackAllWithConfirmation(trackingReminderNotification, 1, $event)"
57-
ng-click="track(trackingReminderNotification, 1, $event, trackAll)">
57+
ng-click="track(trackingReminderNotification, 1, $event)">
5858
<i class="ion-android-done"> &nbsp; YES &nbsp</i>
5959
</button>
6060
</div>

0 commit comments

Comments
 (0)