krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed task push text and move ctrlPressed logic to rootScope.

Browse Source
This commit is contained in:
Keith Holliday
2015-11-28 12:06:34 -06:00
parent 274f4ab4d2
commit 0dcba276a6
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
website/public/js/controllers/tasksCtrl.js
View File

@@ -76,23 +76,10 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
* Pushes task to top or bottom of list
*/
$scope.pushTask = function(task, index, location) {
var to = (location === 'bottom' || $scope.pushLocation === 'bottom') ? -1 : 0;
var to = (location === 'bottom' || $scope.ctrlPressed) ? -1 : 0;
User.user.ops.sortTask({params:{id:task.id},query:{from:index, to:to}})
};
var ctrlKeys = [17, 224, 91];
$scope.$on("habit:keydown", function (e, keyEvent) {
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.pushLocation = "bottom";
}
});
$scope.$on("habit:keyup", function (e, keyEvent) {
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.pushLocation = "top";
}
});
/**
* This is calculated post-change, so task.completed=true if they just checked it
*/