From 4399e2e4fffc4faba9f1505dfc0ad3150a948632 Mon Sep 17 00:00:00 2001 From: Stephen Blott Date: Tue, 17 Mar 2015 12:06:15 +0000 Subject: Activate vomnibar in window.top; more clean up. --- content_scripts/vomnibar.coffee | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'content_scripts/vomnibar.coffee') diff --git a/content_scripts/vomnibar.coffee b/content_scripts/vomnibar.coffee index 823dcd01..3d54e643 100644 --- a/content_scripts/vomnibar.coffee +++ b/content_scripts/vomnibar.coffee @@ -4,33 +4,33 @@ Vomnibar = vomnibarUI: null - # frameId here (and below) is the ID of the frame from which this request originates, which may be different + # sourceFrameId here (and below) is the ID of the frame from which this request originates, which may be different # from the current frame. - activate: (frameId) -> @open frameId, {completer:"omni"} - activateInNewTab: (frameId) -> @open frameId, { + activate: (sourceFrameId) -> @open sourceFrameId, {completer:"omni"} + activateInNewTab: (sourceFrameId) -> @open sourceFrameId, { completer: "omni" selectFirst: false newTab: true } - activateTabSelection: (frameId) -> @open frameId, { + activateTabSelection: (sourceFrameId) -> @open sourceFrameId, { completer: "tabs" selectFirst: true } - activateBookmarks: (frameId) -> @open frameId, { + activateBookmarks: (sourceFrameId) -> @open sourceFrameId, { completer: "bookmarks" selectFirst: true } - activateBookmarksInNewTab: (frameId) -> @open frameId, { + activateBookmarksInNewTab: (sourceFrameId) -> @open sourceFrameId, { completer: "bookmarks" selectFirst: true newTab: true } - activateEditUrl: (frameId) -> @open frameId, { + activateEditUrl: (sourceFrameId) -> @open sourceFrameId, { completer: "omni" selectFirst: false query: window.location.href } - activateEditUrlInNewTab: (frameId) -> @open frameId, { + activateEditUrlInNewTab: (sourceFrameId) -> @open sourceFrameId, { completer: "omni" selectFirst: false query: window.location.href @@ -50,7 +50,7 @@ Vomnibar = # query - Optional. Text to prefill the Vomnibar with. # selectFirst - Optional, boolean. Whether to select the first entry. # newTab - Optional, boolean. Whether to open the result in a new tab. - open: (frameId, options) -> @vomnibarUI.activate extend options, { frameId } + open: (sourceFrameId, options) -> @vomnibarUI.activate extend options, { sourceFrameId } root = exports ? window root.Vomnibar = Vomnibar -- cgit v1.2.3