From 55f039892817643fc39fb636978690228cf605a2 Mon Sep 17 00:00:00 2001
From: Nick Bunn <thrain123@gmail.com>
Date: Wed, 13 Apr 2016 01:16:50 -0500
Subject: [PATCH] moved broadcast to task page. changed up key press binding

---
 website/public/js/controllers/rootCtrl.js  | 14 --------------
 website/public/js/controllers/tasksCtrl.js | 22 ++++++++++++++++++++++
 website/views/index.jade                   |  2 +-
 website/views/main/index.jade              |  2 +-
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/website/public/js/controllers/rootCtrl.js b/website/public/js/controllers/rootCtrl.js
index eacc0d2cce..d9d42d6a22 100644
--- a/website/public/js/controllers/rootCtrl.js
+++ b/website/public/js/controllers/rootCtrl.js
@@ -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;
-      }
-    });
   }
 ]);
diff --git a/website/public/js/controllers/tasksCtrl.js b/website/public/js/controllers/tasksCtrl.js
index 619b0a8b3f..6073ec7fe7 100644
--- a/website/public/js/controllers/tasksCtrl.js
+++ b/website/public/js/controllers/tasksCtrl.js
@@ -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;
+    }
   }]);
diff --git a/website/views/index.jade b/website/views/index.jade
index b1568d254a..f3d993d1e7 100644
--- a/website/views/index.jade
+++ b/website/views/index.jade
@@ -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
diff --git a/website/views/main/index.jade b/website/views/main/index.jade
index 586ce3ca60..3a8ac8d03c 100644
--- a/website/views/main/index.jade
+++ b/website/views/main/index.jade
@@ -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')