From 81316680dffd1f890f08794f3b4f1df7de69ef20 Mon Sep 17 00:00:00 2001
From: Raymond Lee <raymond@raysquare.com>
Date: Thu, 19 May 2011 14:07:42 +0800
Subject: [PATCH] Bug 654601 - cannot use copy and paste keyboard shortcuts in
 panorama r=ian

---
 browser/base/content/tabview/ui.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/tabview/ui.js b/browser/base/content/tabview/ui.js
index e9cba640ccf..921150bd53a 100644
--- a/browser/base/content/tabview/ui.js
+++ b/browser/base/content/tabview/ui.js
@@ -995,7 +995,8 @@ let UI = {
 #ifdef XP_MACOSX
       "preferencesCmdMac", "minimizeWindow",
 #endif
-      "newNavigator", "newNavigatorTab", "find"
+      "newNavigator", "newNavigatorTab", "undo", "cut", "copy", "paste", 
+      "selectAll", "find"
      ].forEach(function(key) {
       let element = gWindow.document.getElementById("key_" + key);
       keys[key] = element.getAttribute("key").toLocaleLowerCase().charCodeAt(0);
@@ -1004,7 +1005,7 @@ let UI = {
     // for key combinations with shift key, the charCode of upper case letters 
     // are different to the lower case ones so need to handle them differently.
     ["closeWindow", "tabview", "undoCloseTab", "undoCloseWindow",
-     "privatebrowsing"].forEach(function(key) {
+     "privatebrowsing", "redo"].forEach(function(key) {
       let element = gWindow.document.getElementById("key_" + key);
       keys[key] = element.getAttribute("key").toLocaleUpperCase().charCodeAt(0);
     });
@@ -1043,6 +1044,7 @@ let UI = {
               case self._browserKeys.undoCloseTab:
               case self._browserKeys.undoCloseWindow:
               case self._browserKeys.closeWindow:
+              case self._browserKeys.redo:
                 preventDefault = false;
                 break;
               case self._browserKeys.tabview:
@@ -1056,6 +1058,11 @@ let UI = {
                 break;
               case self._browserKeys.newNavigator:
               case self._browserKeys.newNavigatorTab:
+              case self._browserKeys.undo:
+              case self._browserKeys.cut:
+              case self._browserKeys.copy:
+              case self._browserKeys.paste:
+              case self._browserKeys.selectAll:
                 preventDefault = false;
                 break;
 #ifdef XP_UNIX