From dd7e4f19babdfac704d2c38e4c2fe9cd28882de1 Mon Sep 17 00:00:00 2001
From: perploug <pph@umbraco.dk>
Date: Tue, 20 Aug 2013 15:21:12 +0200
Subject: [PATCH] Removed keyboard service debug logging

---
 .../src/common/directives/hotkey.directive.js |  9 ---------
 .../src/common/services/keyboard.service.js   |  2 +-
 .../common/services/keyboard-service.spec.js  | 20 ++++---------------
 3 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/hotkey.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/hotkey.directive.js
index 4406ad4edd..fbe3d2d636 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/hotkey.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/hotkey.directive.js
@@ -5,22 +5,13 @@
 angular.module("umbraco.directives")
   .directive('hotkey', function ($window, keyboardService, $log) {
       return function (scope, el, attrs) {
-
           var keyCombo = attrs["hotkey"];
-          $log.log(keyCombo);
-
           keyboardService.bind(keyCombo, function() {
               var element = $(el);
-
-              $log.log(element);
-
               if(element.is("a,button,input[type='button'],input[type='submit']")){
                 element.click();
-                $log.log("click");
-
               }else{
                 element.focus();
-                $log.log("focus");
               }
           });
           
diff --git a/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js b/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
index 8328d3e476..fda9f007cc 100644
--- a/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
+++ b/src/Umbraco.Web.UI.Client/src/common/services/keyboard.service.js
@@ -25,6 +25,7 @@ angular.module('umbraco.services')
 			elt = document.getElementById(opt.target);	
 		} 
 
+	
 		fct = function (e) {
 			e = e || $window.event;
 
@@ -217,7 +218,6 @@ angular.module('umbraco.services')
 					return false;
 				}
 			}
-
 		};
 		// Store shortcut
 		keyboardManagerService.keyboardEvent[label] = {
diff --git a/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js b/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js
index 32888d9a02..82f7766d40 100644
--- a/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js
+++ b/src/Umbraco.Web.UI.Client/test/unit/common/services/keyboard-service.spec.js
@@ -2,7 +2,7 @@ describe('keyboard service tests', function () {
     var keyboardService, $window;
 
       var createKeyEvent = function (mainKey, alt, ctrl, shift, meta) {
-        var keyEvent = jQuery.Event("keypress");
+        var keyEvent = jQuery.Event("keydown");
         keyEvent.keyCode = mainKey.charCodeAt(0);
         keyEvent.altKey = alt;
         keyEvent.ctrlKey = ctrl;
@@ -26,17 +26,8 @@ describe('keyboard service tests', function () {
             var el = $("<span></span>");
             var ev = createKeyEvent("s", false, true, false);
 
-            el.keypress(function(ev) {
-              console.log(ev);  
-              console.log("Handler for .keypress() called.");
-            });
-
-
-            console.log("loaded");
-
             keyboardService.bind("ctrl+s", function(){
                 ctrls = true;
-                console.log("triggered");
             }, el);
 
             //initially it should be false
@@ -45,12 +36,9 @@ describe('keyboard service tests', function () {
             //trigger the ctrls+s event
             el.trigger(ev);
 
-            //it should now be true
-//            expect(ctrls).toBe(true);
-
-          //  expect(iconHelper.isFileBasedIcon(legacyBased)).toBe(false);
-          //  expect(iconHelper.isFileBasedIcon(belleBased)).toBe(false);
-        });
+            //it should now be true - this failes for some reason
+           //expect(ctrls).toBe(true);
+     });
         
         /*
         it('detects a legacy icon', function () {