From fe40288514ca8da6d8027e1d5deeecdabb27f6ff Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 12 Nov 2013 10:02:59 +0100 Subject: [PATCH] fixes dublicate hotkey in legacy editors --- .../lib/umbraco/compat.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js index 2a166c8a1a..3cc91174e8 100644 --- a/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js +++ b/src/Umbraco.Web.UI.Client/lib/umbraco/compat.js @@ -31,8 +31,7 @@ $.ctrl("S", function(){ var link = $(".umb-panel-header .btn-primary"); - var b = link.click(); - + //this is made of bad, to work around webforms horrible wiring if(!link.hasClass("client-side") && link.attr("href").indexOf("javascript:") == 0){ eval(link.attr('href').replace('javascript:','')); @@ -59,23 +58,26 @@ $.ctrl = function(key, callback, args) { var isMac = navigator.platform.toUpperCase().indexOf('MAC')>=0; var isCtrl = false; + $(document).keydown(function(e) { if(!args) args=[]; // IE barks when args is null var modKey = isMac ? e.metaKey : e.ctrlKey; - if(modKey){ - isCtrl = true; - } + //if(modKey){ + // isCtrl = true; + //} - if(isCtrl && e.keyCode == key.charCodeAt(0)) { + if(modKey && e.keyCode == key.charCodeAt(0)) { callback.apply(this, args); return false; } - }).keyup(function(e) { + }); + + /*.keyup(function(e) { var modKey = isMac ? e.metaKey : e.ctrlKey; if(modKey){ isCtrl = false; } - }); + }); */ }; })(jQuery); \ No newline at end of file