aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Blott2016-09-24 08:54:08 +0100
committerStephen Blott2016-09-24 08:54:08 +0100
commitcfca5794e4073baacb9b3d4a6b0ce21d6587fd34 (patch)
treeb9658279b0eeb91567b6af617ee4d03b97d7d7fb
parent89c93f61aace514487c918ae2c55674136953058 (diff)
parentd6db15d6d558b3def86c1b0ac25904abf89adef9 (diff)
downloadvimium-cfca5794e4073baacb9b3d4a6b0ce21d6587fd34.tar.bz2
Merge remote-tracking branch 'tobimensch/master'
-rw-r--r--README.md2
-rw-r--r--background_scripts/commands.coffee3
-rw-r--r--background_scripts/main.coffee1
3 files changed, 6 insertions, 0 deletions
diff --git a/README.md b/README.md
index 12c13dcc..6162d6f8 100644
--- a/README.md
+++ b/README.md
@@ -81,6 +81,7 @@ Manipulating tabs:
X restore closed tab (i.e. unwind the 'x' command)
T search through your open tabs
<a-p> pin/unpin current tab
+ <a-m> mute/unmute current tab
Using marks:
@@ -161,6 +162,7 @@ Release Notes
Changes since previous release (not in the Chrome Store version)
+- New commands: "mute/unmute tab".
- You can now map `<backspace>` to a Vimium command (e.g. `map <backspace> goBack`).
- Bug fixes:
- `<c-a-[>` is no longer handled (incorrectly) as `Escape`. This also affects `<Alt-Gr-[>`.
diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index f865131d..6f7122dd 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -171,6 +171,7 @@ Commands =
"lastTab",
"duplicateTab",
"togglePinTab",
+ "toggleMuteTab",
"removeTab",
"restoreTab",
"moveTabToNewWindow",
@@ -273,6 +274,7 @@ defaultKeyMappings =
"X": "restoreTab"
"<a-p>": "togglePinTab"
+ "<a-m>": "toggleMuteTab"
"o": "Vomnibar.activate"
"O": "Vomnibar.activateInNewTab"
@@ -363,6 +365,7 @@ commandDescriptions =
moveTabToNewWindow: ["Move tab to new window", { background: true }]
togglePinTab: ["Pin/unpin current tab", { background: true, noRepeat: true }]
+ toggleMuteTab: ["Mute/unmute current tab", { background: true, noRepeat: true }]
closeTabsOnLeft: ["Close tabs on the left", {background: true, noRepeat: true}]
closeTabsOnRight: ["Close tabs on the right", {background: true, noRepeat: true}]
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 929d5537..d9b527ef 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -210,6 +210,7 @@ BackgroundCommands =
openCopiedUrlInCurrentTab: (request) -> TabOperations.openUrlInCurrentTab extend request, url: Clipboard.paste()
openCopiedUrlInNewTab: (request) -> @createTab extend request, url: Clipboard.paste()
togglePinTab: ({tab}) -> chrome.tabs.update tab.id, {pinned: !tab.pinned}
+ toggleMuteTab: ({tab}) -> chrome.tabs.update tab.id, {muted: !tab.mutedInfo.muted}
moveTabLeft: moveTab
moveTabRight: moveTab
nextFrame: ({count, frameId, tabId}) ->