aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ports/servo/browser.rs14
-rw-r--r--resources/prefs.json1
2 files changed, 4 insertions, 11 deletions
diff --git a/ports/servo/browser.rs b/ports/servo/browser.rs
index 25e6952c0c0..0231cb131b7 100644
--- a/ports/servo/browser.rs
+++ b/ports/servo/browser.rs
@@ -83,10 +83,8 @@ impl Browser {
fn handle_key_from_window(&mut self, ch: Option<char>, key: Key, state: KeyState, mods: KeyModifiers) {
match (mods, ch, key) {
(CMD_OR_CONTROL, Some('r'), _) => {
- if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() {
- if let Some(id) = self.browser_id {
- self.event_queue.push(WindowEvent::Reload(id));
- }
+ if let Some(id) = self.browser_id {
+ self.event_queue.push(WindowEvent::Reload(id));
}
}
(CMD_OR_CONTROL, Some('l'), _) => {
@@ -105,9 +103,7 @@ impl Browser {
}
}
(CMD_OR_CONTROL, Some('q'), _) => {
- if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() {
- self.event_queue.push(WindowEvent::Quit);
- }
+ self.event_queue.push(WindowEvent::Quit);
}
(_, Some('3'), _) => if mods ^ KeyModifiers::CONTROL == KeyModifiers::SHIFT {
self.event_queue.push(WindowEvent::CaptureWebRender);
@@ -137,9 +133,7 @@ impl Browser {
}
}
(KeyModifiers::NONE, None, Key::Escape) => {
- if let Some(true) = PREFS.get("shell.builtin-key-shortcuts.enabled").as_boolean() {
- self.event_queue.push(WindowEvent::Quit);
- }
+ self.event_queue.push(WindowEvent::Quit);
}
_ => {
let event = self.platform_handle_key(key, mods);
diff --git a/resources/prefs.json b/resources/prefs.json
index 5d21c38b10a..4d8aa2b85db 100644
--- a/resources/prefs.json
+++ b/resources/prefs.json
@@ -63,7 +63,6 @@
"network.http-cache.disabled": false,
"network.mime.sniff": false,
"session-history.max-length": 20,
- "shell.builtin-key-shortcuts.enabled": true,
"shell.homepage": "https://servo.org",
"shell.keep_screen_on.enabled": false,
"shell.native-orientation": "both",