From 2ab2a5a9f3d309c7fd8bcf2ebff534c0c420f52a Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Sat, 5 Oct 2013 19:23:57 +0200
Subject: [PATCH] Fix bug where Right ALT+S would save in Firefox instead of
 inserting the correct character

---
 .../umbraco/js/umbracoCheckKeys.js            | 32 +++++++++----------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js b/src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js
index ba1cda9a3a..0b3a8e8387 100644
--- a/src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js
+++ b/src/Umbraco.Web.UI/umbraco/js/umbracoCheckKeys.js
@@ -32,7 +32,7 @@ function umbracoCheckKeys(e) {
 }
 
 function shortcutCheckKeysPressFirefox(e) {
-	    if (ctrlDown && keycode == 83 && !e.altKey)
+	    if (ctrlDown && keycode == 83)
 	        e.preventDefault();
 }
 
@@ -71,22 +71,20 @@ function runShortCuts() {
 				}
 			}
 			if (ctrlDown) {
-			    try {
-			        if (keycode == 83)
-			            doSubmit();
-			        else if (keycode == 85)
-			            document.getElementById('TabView1_tab01layer_publish').click();
-			        else if (!shiftDown && keycode == 9) {
-			            functionsFrame.tabSwitch(1);
-			            return false;
-			        }
-			        else
-			            if (shiftDown && keycode == 9) {
-			                functionsFrame.tabSwitch(-1);
-			                return false;
-			            }
-			    } catch(e) {
-			    } 
+				if (keycode == 83)
+					doSubmit();
+				else if (keycode == 85)
+					document.getElementById('TabView1_tab01layer_publish').click();
+				else if (!shiftDown && keycode == 9) {
+					functionsFrame.tabSwitch(1);
+					return false;
+				}
+				else
+					if (shiftDown && keycode == 9) {
+						functionsFrame.tabSwitch(-1);
+						return false;
+					}
+					
 			}
 		}