зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1246034 - Part 2: [webext] Add support for _execute_browser_action. r=kmag
MozReview-Commit-ID: EIbPidn07qZ --HG-- extra : rebase_source : 5ed49fb3b70fa07b6ec5430381c73d702d156898
This commit is contained in:
Matthew Wein
Родитель
1d020acead
Коммит
019b4824e4
|
|
@ -3,6 +3,7 @@
|
|||
|
||||
"globals": {
|
||||
"AllWindowEvents": true,
|
||||
"browserActionFor": true,
|
||||
"currentWindow": true,
|
||||
"EventEmitter": true,
|
||||
"IconDetails": true,
|
||||
|
|
@ -16,3 +17,5 @@
|
|||
"WindowManager": true,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -23,8 +23,6 @@ const XUL_NS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
|
|||
// WeakMap[Extension -> BrowserAction]
|
||||
var browserActionMap = new WeakMap();
|
||||
|
||||
global.browserActionOf = browserActionOf;
|
||||
|
||||
// Responsible for the browser_action section of the manifest as well
|
||||
// as the associated popup.
|
||||
function BrowserAction(options, extension) {
|
||||
|
|
|
|||
|
|
@ -128,6 +128,9 @@ CommandList.prototype = {
|
|||
if (name == "_execute_page_action") {
|
||||
let win = event.target.ownerDocument.defaultView;
|
||||
pageActionFor(this.extension).triggerAction(win);
|
||||
} else if (name == "_execute_browser_action") {
|
||||
let win = event.target.ownerDocument.defaultView;
|
||||
browserActionFor(this.extension).triggerAction(win);
|
||||
} else {
|
||||
TabManager.for(this.extension)
|
||||
.addActiveTabPermission(TabManager.activeTab);
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ support-files =
|
|||
[browser_ext_browserAction_popup.js]
|
||||
[browser_ext_browserAction_popup_resize.js]
|
||||
[browser_ext_browserAction_simple.js]
|
||||
[browser_ext_commands_execute_browser_action.js]
|
||||
[browser_ext_commands_execute_page_action.js]
|
||||
[browser_ext_commands_getAll.js]
|
||||
[browser_ext_commands_onCommand.js]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,113 @@
|
|||
/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
||||
/* vim: set sts=2 sw=2 et tw=80: */
|
||||
"use strict";
|
||||
|
||||
function* testExecuteBrowserActionWithOptions(options = {}) {
|
||||
let extensionOptions = {};
|
||||
|
||||
extensionOptions.manifest = {
|
||||
"commands": {
|
||||
"_execute_browser_action": {
|
||||
"suggested_key": {
|
||||
"default": "Alt+Shift+J",
|
||||
},
|
||||
},
|
||||
},
|
||||
"browser_action": {
|
||||
"browser_style": true,
|
||||
},
|
||||
};
|
||||
|
||||
if (options.withPopup) {
|
||||
extensionOptions.manifest.browser_action.default_popup = "popup.html";
|
||||
|
||||
extensionOptions.files = {
|
||||
"popup.html": `
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<script src="popup.js"></script>
|
||||
</head>
|
||||
</html>
|
||||
`,
|
||||
|
||||
"popup.js": function() {
|
||||
browser.runtime.sendMessage("from-browser-action-popup");
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
extensionOptions.background = () => {
|
||||
browser.test.onMessage.addListener((message, withPopup) => {
|
||||
browser.commands.onCommand.addListener((commandName) => {
|
||||
if (commandName == "_execute_browser_action") {
|
||||
browser.test.fail("The onCommand listener should never fire for _execute_browser_action.");
|
||||
}
|
||||
});
|
||||
|
||||
browser.browserAction.onClicked.addListener(() => {
|
||||
if (withPopup) {
|
||||
browser.test.fail("The onClick listener should never fire if the browserAction has a popup.");
|
||||
browser.test.notifyFail("execute-browser-action-on-clicked-fired");
|
||||
} else {
|
||||
browser.test.notifyPass("execute-browser-action-on-clicked-fired");
|
||||
}
|
||||
});
|
||||
|
||||
browser.runtime.onMessage.addListener(msg => {
|
||||
if (msg == "from-browser-action-popup") {
|
||||
browser.test.notifyPass("execute-browser-action-popup-opened");
|
||||
}
|
||||
});
|
||||
|
||||
browser.test.sendMessage("send-keys");
|
||||
});
|
||||
}
|
||||
|
||||
let extension = ExtensionTestUtils.loadExtension(extensionOptions);
|
||||
|
||||
extension.onMessage("send-keys", () => {
|
||||
EventUtils.synthesizeKey("j", {altKey: true, shiftKey: true});
|
||||
});
|
||||
|
||||
yield extension.startup();
|
||||
|
||||
if (options.inArea) {
|
||||
let widget = getBrowserActionWidget(extension);
|
||||
CustomizableUI.addWidgetToArea(widget.id, options.inArea);
|
||||
}
|
||||
|
||||
extension.sendMessage("withPopup", options.withPopup);
|
||||
|
||||
if (options.withPopup) {
|
||||
yield extension.awaitFinish("execute-browser-action-popup-opened");
|
||||
yield closeBrowserAction(extension);
|
||||
} else {
|
||||
yield extension.awaitFinish("execute-browser-action-on-clicked-fired");
|
||||
}
|
||||
yield extension.unload();
|
||||
}
|
||||
|
||||
add_task(function* test_execute_browser_action_with_popup() {
|
||||
yield testExecuteBrowserActionWithOptions({
|
||||
withPopup: true,
|
||||
});
|
||||
});
|
||||
|
||||
add_task(function* test_execute_browser_action_without_popup() {
|
||||
yield testExecuteBrowserActionWithOptions();
|
||||
});
|
||||
|
||||
add_task(function* test_execute_browser_action_in_hamburger_menu_with_popup() {
|
||||
yield testExecuteBrowserActionWithOptions({
|
||||
withPopup: true,
|
||||
inArea: CustomizableUI.AREA_PANEL,
|
||||
});
|
||||
});
|
||||
|
||||
add_task(function* test_execute_browser_action_in_hamburger_menu_without_popup() {
|
||||
yield testExecuteBrowserActionWithOptions({
|
||||
inArea: CustomizableUI.AREA_PANEL,
|
||||
});
|
||||
});
|
||||
Загрузка…
Ссылка в новой задаче