sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-22 03:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved broadcast to task page. changed up key press binding

Browse source
This commit is contained in:
Nick Bunn 2016-04-13 01:16:50 -05:00
parent 59749acf50
commit 55f0398928
4 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
website/public/js/controllers/rootCtrl.js
View file

@ -330,19 +330,5 @@ habitrpg.controller("RootCtrl", ['$scope', '$rootScope', '$location', 'User', '$
});
// error will be handled via $http interceptor
}
// Global Keyevents
var ctrlKeys = [17, 224, 91];
$scope.$on("habit:keydown", function (e, keyEvent) {
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.ctrlPressed = true;
}
});
$scope.$on("habit:keyup", function (e, keyEvent) {
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.ctrlPressed = false;
}
});
}
]);

22
website/public/js/controllers/tasksCtrl.js
View file

@ -258,4 +258,26 @@ habitrpg.controller("TasksCtrl", ['$scope', '$rootScope', '$location', 'User','N
$rootScope.playSound('Reward');
}
}
var ctrlKeys = [17, 224, 91];
$scope.hoverIn = function () {
$(document).keydown(function (keyEvent) {
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.ctrlPressed = true;
$scope.$apply();
}
});
$(document).keyup(function (keyEvent) {
console.log('blah');
if (ctrlKeys.indexOf(keyEvent.keyCode) !== -1) {
$scope.ctrlPressed = false;
$scope.$apply();
}
});
}
$scope.hoverout = function () {
$(document).unbind('keydown');
$(document).unbind('keyup');
$scope.ctrlPressed = false;
}
}]);

2
website/views/index.jade
View file

@ -1,6 +1,6 @@
doctype html
//html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keypress="{27:'castCancel()'}")
html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keyup="{27:'castCancel()'}", ng-keydown="$broadcast('habit:keydown', $event)", ng-keyup="$broadcast('habit:keyup', $event)")
html(ng-app="habitrpg", ng-controller="RootCtrl", ng-class='{"applying-action":applyingAction}', ui-keyup="{27:'castCancel()'}")
head
title(ng-bind="env.t('habitica') + ' | ' + $root.pageTitle")
// ?v=1 needed to force refresh

2
website/views/main/index.jade
View file

@ -1,4 +1,4 @@
script(id='partials/main.html', type="text/ng-template")
include ./filters
div(ng-controller='TasksCtrl')
div(ng-controller='TasksCtrl', ng-mouseenter="hoverIn()", ng-mouseleave="hoverout()")
habitrpg-tasks(main='true', obj='user')