From e4127fc8f779a5c784332e65b1322180c4381dd0 Mon Sep 17 00:00:00 2001
From: Stephen Blott
Date: Wed, 9 Mar 2016 16:29:16 +0000
Subject: Fix mainFrame command...

Oversight from #2022.
---
 background_scripts/commands.coffee | 2 +-
 background_scripts/main.coffee     | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

(limited to 'background_scripts')

diff --git a/background_scripts/commands.coffee b/background_scripts/commands.coffee
index 55cb60d2..2e597e32 100644
--- a/background_scripts/commands.coffee
+++ b/background_scripts/commands.coffee
@@ -385,7 +385,7 @@ commandDescriptions =
   "Vomnibar.activateEditUrlInNewTab": ["Edit the current URL and open in a new tab", { topFrame: true }]
 
   nextFrame: ["Cycle forward to the next frame on the page", { background: true, passCountToFunction: true }]
-  mainFrame: ["Select the tab's main/top frame", { background: true, noRepeat: true }]
+  mainFrame: ["Select the tab's main/top frame", { topFrame: true, noRepeat: true }]
 
   "Marks.activateCreateMode": ["Create a new mark", { noRepeat: true }]
   "Marks.activateGotoMode": ["Go to a mark", { noRepeat: true }]
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
index 49199cae..81a694d0 100644
--- a/background_scripts/main.coffee
+++ b/background_scripts/main.coffee
@@ -288,10 +288,6 @@ BackgroundCommands =
     chrome.tabs.getSelected null, (tab) ->
       frameIdsForTab[tab.id] = cycleToFrame frameIdsForTab[tab.id], frameId, count
       chrome.tabs.sendMessage tab.id, name: "focusFrame", frameId: frameIdsForTab[tab.id][0], highlight: true
-  mainFrame: ->
-    chrome.tabs.getSelected null, (tab) ->
-      # The front end interprets a frameId of 0 to mean the main/top from.
-      chrome.tabs.sendMessage tab.id, name: "focusFrame", frameId: 0, highlight: true
 
   closeTabsOnLeft: -> removeTabsRelative "before"
   closeTabsOnRight: -> removeTabsRelative "after"
-- 
cgit v1.2.3