summaryrefslogtreecommitdiffstats
path: root/application
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 06:35:21 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 06:35:21 +0200
commit522095380fc6cf3b214746802012fccb8f1071bd (patch)
tree599baf7c39e78fe1a9ca3edc073cb3dfb171a54d /application
parent90e7b450997fcf0e48034dbec4402f9f68027b0b (diff)
downloadUXP-522095380fc6cf3b214746802012fccb8f1071bd.tar
UXP-522095380fc6cf3b214746802012fccb8f1071bd.tar.gz
UXP-522095380fc6cf3b214746802012fccb8f1071bd.tar.lz
UXP-522095380fc6cf3b214746802012fccb8f1071bd.tar.xz
UXP-522095380fc6cf3b214746802012fccb8f1071bd.zip
Bug 431901 - Update preference dialogs to treat backspace and delete equivalently on Mac OS X
Diffstat (limited to 'application')
-rw-r--r--application/palemoon/components/preferences/cookies.js7
-rw-r--r--application/palemoon/components/preferences/jar.mn4
-rw-r--r--application/palemoon/components/preferences/permissions.js7
3 files changed, 14 insertions, 4 deletions
diff --git a/application/palemoon/components/preferences/cookies.js b/application/palemoon/components/preferences/cookies.js
index ea7e7d4e2..d493a0056 100644
--- a/application/palemoon/components/preferences/cookies.js
+++ b/application/palemoon/components/preferences/cookies.js
@@ -725,8 +725,13 @@ var gCookiesWindow = {
},
onCookieKeyPress: function (aEvent) {
- if (aEvent.keyCode == 46)
+ if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE
+#ifdef XP_MACOSX
+ || aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE
+#endif
+ ) {
this.deleteCookie();
+ }
},
_lastSortProperty : "",
diff --git a/application/palemoon/components/preferences/jar.mn b/application/palemoon/components/preferences/jar.mn
index a27784305..c1f7a5511 100644
--- a/application/palemoon/components/preferences/jar.mn
+++ b/application/palemoon/components/preferences/jar.mn
@@ -15,7 +15,7 @@ browser.jar:
* content/browser/preferences/applicationManager.js
* content/browser/preferences/colors.xul
* content/browser/preferences/cookies.xul
- content/browser/preferences/cookies.js
+* content/browser/preferences/cookies.js
content/browser/preferences/content.xul
content/browser/preferences/content.js
* content/browser/preferences/connection.xul
@@ -29,7 +29,7 @@ browser.jar:
* content/browser/preferences/main.xul
content/browser/preferences/main.js
* content/browser/preferences/permissions.xul
- content/browser/preferences/permissions.js
+* content/browser/preferences/permissions.js
* content/browser/preferences/preferences.xul
content/browser/preferences/privacy.xul
content/browser/preferences/privacy.js
diff --git a/application/palemoon/components/preferences/permissions.js b/application/palemoon/components/preferences/permissions.js
index 25d86fabf..30c1db8be 100644
--- a/application/palemoon/components/preferences/permissions.js
+++ b/application/palemoon/components/preferences/permissions.js
@@ -283,8 +283,13 @@ var gPermissionManager = {
onPermissionKeyPress: function (aEvent)
{
- if (aEvent.keyCode == 46)
+ if (aEvent.keyCode == KeyEvent.DOM_VK_DELETE
+#ifdef XP_MACOSX
+ || aEvent.keyCode == KeyEvent.DOM_VK_BACK_SPACE
+#endif
+ ) {
this.onPermissionDeleted();
+ }
},
_lastPermissionSortColumn: "",