Skip to content

Removed polymorphic trackAll usage #4047

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 19, 2020
Merged

Removed polymorphic trackAll usage #4047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
752c5b6
Removed polymorphic trackAll usage
mikepsinn Sep 18, 2020
00d54f8
Merge branch 'develop' into feature/trackAll
mikepsinn Sep 19, 2020
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
5 changes: 1 addition & 4 deletions src/js/controllers/remindersInboxCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,11 +278,8 @@ angular.module('starter').controller('RemindersInboxCtrl', ["$scope", "$state",
refreshIfRunningOutOfNotifications();
return n;
};
$scope.track = function(n, value, $ev, trackAll){ // Keep trackAll param because it's used in templates/items/notification-item.html
$scope.track = function(n, value, $ev){ // Keep trackAll param because it's used in templates/items/notification-item.html
if(isGhostClick($ev)){return false;}
if(trackAll){
return $scope.trackAll(n, value, $ev);
}
n.action = 'track';
n.modifiedValue = value;
var valueUnit = qm.stringHelper.formatValueUnitDisplayText(n.modifiedValue + ' ' + n.unitAbbreviatedName);
Expand Down
10 changes: 5 additions & 5 deletions src/templates/items/notification-value-input-buttons.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<img id="{{'numericRatingOptions' + option.numericValue}}"
ng-repeat="option in numericRatingOptions"
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
title="{{option.numericValue}}/5"
ng-src="{{option.img}}">
</div>
Expand All @@ -23,7 +23,7 @@
<img id="{{'positiveRatingOptions' + option.numericValue}}"
ng-repeat="option in positiveRatingOptions"
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
title="{{option.numericValue}}/5"
ng-src="{{option.img}}">
</div>
Expand All @@ -35,7 +35,7 @@
<img id="{{'negativeRatingOptions' + option.numericValue}}"
ng-repeat="option in negativeRatingOptions"
on-hold="trackAllWithConfirmation(trackingReminderNotification, option.numericValue, $event)"
ng-click="track(trackingReminderNotification, option.numericValue, $event, trackAll)"
ng-click="track(trackingReminderNotification, option.numericValue, $event)"
title="{{option.numericValue}}/5"
ng-src="{{option.img}}">
</div>
Expand All @@ -48,13 +48,13 @@
<button class="button button-assertive"
style="text-overflow: clip; font-size: 14px;"
on-hold="trackAllWithConfirmation(trackingReminderNotification, 0, $event)"
ng-click="track(trackingReminderNotification, 0, $event, trackAll)">
ng-click="track(trackingReminderNotification, 0, $event)">
<i class="ion-android-done"> &nbsp; NO &nbsp</i>
</button>
<button class="button button-balanced"
style="text-overflow: clip; font-size: 14px;"
on-hold="trackAllWithConfirmation(trackingReminderNotification, 1, $event)"
ng-click="track(trackingReminderNotification, 1, $event, trackAll)">
ng-click="track(trackingReminderNotification, 1, $event)">
<i class="ion-android-done"> &nbsp; YES &nbsp</i>
</button>
</div>
Expand Down