diff --git a/addon-sdk/moz.build b/addon-sdk/moz.build
index ae6f68bc3552..2ae1b36ba71d 100644
--- a/addon-sdk/moz.build
+++ b/addon-sdk/moz.build
@@ -32,6 +32,7 @@ addons = [
'e10s-remote',
'e10s-tabs',
'e10s',
+ 'embedded-webextension',
'l10n-properties',
'l10n',
'layout-change',
@@ -183,6 +184,10 @@ EXTRA_JS_MODULES.commonjs += [
'source/lib/test.js',
]
+EXTRA_JS_MODULES.commonjs.sdk += [
+ 'source/lib/sdk/webextension.js',
+]
+
EXTRA_JS_MODULES.commonjs.dev += [
'source/lib/dev/debuggee.js',
'source/lib/dev/frame-script.js',
diff --git a/addon-sdk/source/app-extension/bootstrap.js b/addon-sdk/source/app-extension/bootstrap.js
index 31fc658add1b..3b1e13fe7865 100644
--- a/addon-sdk/source/app-extension/bootstrap.js
+++ b/addon-sdk/source/app-extension/bootstrap.js
@@ -257,6 +257,9 @@ function startup(data, reasonCode) {
let module = cuddlefish.Module('sdk/loader/cuddlefish', cuddlefishURI);
let require = cuddlefish.Require(loader, module);
+ // Init the 'sdk/webextension' module from the bootstrap addon parameter.
+ require("sdk/webextension").initFromBootstrapAddonParam(data);
+
require('sdk/addon/runner').startup(reason, {
loader: loader,
main: main,
diff --git a/addon-sdk/source/lib/sdk/addon/bootstrap.js b/addon-sdk/source/lib/sdk/addon/bootstrap.js
index 094f9123c043..e4c94eb299bf 100644
--- a/addon-sdk/source/lib/sdk/addon/bootstrap.js
+++ b/addon-sdk/source/lib/sdk/addon/bootstrap.js
@@ -123,7 +123,7 @@ Bootstrap.prototype = {
manifest: metadata,
metadata: metadata,
modules: {
- "@test/options": {}
+ "@test/options": {},
},
noQuit: prefs.get(`extensions.${id}.sdk.test.no-quit`, false)
});
@@ -134,6 +134,9 @@ Bootstrap.prototype = {
const main = command === "test" ? "sdk/test/runner" : null;
const prefsURI = `${baseURI}defaults/preferences/prefs.js`;
+ // Init the 'sdk/webextension' module from the bootstrap addon parameter.
+ require("sdk/webextension").initFromBootstrapAddonParam(addon);
+
const { startup } = require("sdk/addon/runner");
startup(reason, {loader, main, prefsURI});
}.bind(this)).catch(error => {
diff --git a/addon-sdk/source/lib/sdk/webextension.js b/addon-sdk/source/lib/sdk/webextension.js
new file mode 100644
index 000000000000..d1c4385e2bad
--- /dev/null
+++ b/addon-sdk/source/lib/sdk/webextension.js
@@ -0,0 +1,43 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+module.metadata = {
+ "stability": "experimental"
+};
+
+let webExtension;
+let waitForWebExtensionAPI;
+
+module.exports = {
+ initFromBootstrapAddonParam(data) {
+ if (webExtension) {
+ throw new Error("'sdk/webextension' module has been already initialized");
+ }
+
+ webExtension = data.webExtension;
+ },
+
+ startup() {
+ if (!webExtension) {
+ return Promise.reject(new Error(
+ "'sdk/webextension' module is currently disabled. " +
+ "('hasEmbeddedWebExtension' option is missing or set to false)"
+ ));
+ }
+
+ // NOTE: calling `startup` more than once raises an "Embedded Extension already started"
+ // error, but given that SDK addons are going to have access to the startup method through
+ // an SDK module that can be required in any part of the addon, it will be nicer if any
+ // additional startup calls return the startup promise instead of raising an exception,
+ // so that the SDK addon can access the API object in the other addon modules without the
+ // need to manually pass this promise around.
+ if (!waitForWebExtensionAPI) {
+ waitForWebExtensionAPI = webExtension.startup();
+ }
+
+ return waitForWebExtensionAPI;
+ }
+};
diff --git a/addon-sdk/source/python-lib/cuddlefish/rdf.py b/addon-sdk/source/python-lib/cuddlefish/rdf.py
index fb9bb76f6d6f..2964897c199e 100644
--- a/addon-sdk/source/python-lib/cuddlefish/rdf.py
+++ b/addon-sdk/source/python-lib/cuddlefish/rdf.py
@@ -133,6 +133,11 @@ def gen_manifest(template_root_dir, target_cfg, jid,
# booleans in the .json file, not strings.
manifest.set("em:unpack", "true" if target_cfg.get("unpack") else "false")
+ if target_cfg.get('hasEmbeddedWebExtension', False):
+ elem = dom.createElement("em:hasEmbeddedWebExtension");
+ elem.appendChild(dom.createTextNode("true"))
+ dom.documentElement.getElementsByTagName("Description")[0].appendChild(elem)
+
for translator in target_cfg.get("translators", [ ]):
elem = dom.createElement("em:translator");
elem.appendChild(dom.createTextNode(translator))
diff --git a/addon-sdk/source/python-lib/cuddlefish/xpi.py b/addon-sdk/source/python-lib/cuddlefish/xpi.py
index fa585e37b6d9..4ac497e89abc 100644
--- a/addon-sdk/source/python-lib/cuddlefish/xpi.py
+++ b/addon-sdk/source/python-lib/cuddlefish/xpi.py
@@ -48,13 +48,12 @@ def build_xpi(template_root_dir, manifest, xpi_path,
if os.path.isfile(os.path.join(pkgdir, 'chrome.manifest')):
files_to_copy['chrome.manifest'] = os.path.join(pkgdir, 'chrome.manifest')
- # chrome folder (would contain content, skin, and locale folders typically)
- folder = 'chrome'
- if os.path.exists(os.path.join(pkgdir, folder)):
- dirs_to_create.add('chrome')
- # cp -r folder
- abs_dirname = os.path.join(pkgdir, folder)
- for dirpath, dirnames, filenames in os.walk(abs_dirname):
+ def add_special_dir(folder):
+ if os.path.exists(os.path.join(pkgdir, folder)):
+ dirs_to_create.add(folder)
+ # cp -r folder
+ abs_dirname = os.path.join(pkgdir, folder)
+ for dirpath, dirnames, filenames in os.walk(abs_dirname):
goodfiles = list(filter_filenames(filenames, IGNORED_FILES))
dirnames[:] = filter_dirnames(dirnames)
for dirname in dirnames:
@@ -69,6 +68,12 @@ def build_xpi(template_root_dir, manifest, xpi_path,
])
files_to_copy[str(arcpath)] = str(abspath)
+
+ # chrome folder (would contain content, skin, and locale folders typically)
+ add_special_dir('chrome')
+ # optionally include a `webextension/` dir from the add-on dir.
+ add_special_dir('webextension')
+
for dirpath, dirnames, filenames in os.walk(template_root_dir):
if template_root_dir == dirpath:
filenames = list(filter_filenames(filenames, IGNORED_TOP_LVL_FILES))
diff --git a/addon-sdk/source/test/addons/embedded-webextension/main.js b/addon-sdk/source/test/addons/embedded-webextension/main.js
new file mode 100644
index 000000000000..4e51c2f9bb09
--- /dev/null
+++ b/addon-sdk/source/test/addons/embedded-webextension/main.js
@@ -0,0 +1,159 @@
+const tabs = require("sdk/tabs");
+const webExtension = require('sdk/webextension');
+
+exports.testEmbeddedWebExtensionModuleInitializedException = function (assert) {
+ let actualErr;
+
+ assert.throws(
+ () => webExtension.initFromBootstrapAddonParam({webExtension: null}),
+ /'sdk\/webextension' module has been already initialized/,
+ "Got the expected exception if the module is initialized twice"
+ );
+};
+
+exports.testEmbeddedWebExtensionBackgroungPage = function* (assert) {
+ try {
+ const api = yield webExtension.startup();
+ assert.ok(api, `webextension waitForStartup promise successfully resolved`);
+
+ const apiSecondStartup = yield webExtension.startup();
+ assert.equal(api, apiSecondStartup, "Got the same API object from the second startup call");
+
+ const {browser} = api;
+
+ let messageListener;
+ let waitForBackgroundPageMessage = new Promise((resolve, reject) => {
+ let numExpectedMessage = 2;
+ messageListener = (msg, sender, sendReply) => {
+ numExpectedMessage -= 1;
+ if (numExpectedMessage == 1) {
+ assert.equal(msg, "bg->sdk message",
+ "Got the expected message from the background page");
+ sendReply("sdk reply");
+ } else if (numExpectedMessage == 0) {
+ assert.equal(msg, "sdk reply",
+ "The background page received the expected reply message");
+ resolve();
+ } else {
+ console.error("Unexpected message received", {msg,sender, numExpectedMessage});
+ assert.ok(false, `unexpected message received`);
+ reject();
+ }
+ };
+ browser.runtime.onMessage.addListener(messageListener);
+ });
+
+ let portListener;
+ let waitForBackgroundPagePort = new Promise((resolve, reject) => {
+ portListener = (port) => {
+ let numExpectedMessages = 2;
+ port.onMessage.addListener((msg) => {
+ numExpectedMessages -= 1;
+
+ if (numExpectedMessages == 1) {
+ // Check that the legacy context has been able to receive the first port message
+ // and reply with a port message to the background page.
+ assert.equal(msg, "bg->sdk port message",
+ "Got the expected port message from the background page");
+ port.postMessage("sdk->bg port message");
+ } else if (numExpectedMessages == 0) {
+ // Check that the background page has received the above port message.
+ assert.equal(msg, "bg received sdk->bg port message",
+ "The background page received the expected port message");
+ }
+ });
+
+ port.onDisconnect.addListener(() => {
+ assert.equal(numExpectedMessages, 0, "Got the expected number of port messages");
+ resolve();
+ });
+ };
+ browser.runtime.onConnect.addListener(portListener);
+ });
+
+ yield Promise.all([
+ waitForBackgroundPageMessage,
+ waitForBackgroundPagePort,
+ ]).then(() => {
+ browser.runtime.onMessage.removeListener(messageListener);
+ browser.runtime.onConnect.removeListener(portListener);
+ });
+
+ } catch (err) {
+ assert.fail(`Unexpected webextension startup exception: ${err} - ${err.stack}`);
+ }
+};
+
+exports.testEmbeddedWebExtensionContentScript = function* (assert, done) {
+ try {
+ const {browser} = yield webExtension.startup();
+ assert.ok(browser, `webextension startup promise resolved successfully to the API object`);
+
+ let messageListener;
+ let waitForContentScriptMessage = new Promise((resolve, reject) => {
+ let numExpectedMessage = 2;
+ messageListener = (msg, sender, sendReply) => {
+ numExpectedMessage -= 1;
+ if (numExpectedMessage == 1) {
+ assert.equal(msg, "content script->sdk message",
+ "Got the expected message from the content script");
+ sendReply("sdk reply");
+ } else if (numExpectedMessage == 0) {
+ assert.equal(msg, "sdk reply",
+ "The content script received the expected reply message");
+ resolve();
+ } else {
+ console.error("Unexpected message received", {msg,sender, numExpectedMessage});
+ assert.ok(false, `unexpected message received`);
+ reject();
+ }
+ };
+ browser.runtime.onMessage.addListener(messageListener);
+ });
+
+ let portListener;
+ let waitForContentScriptPort = new Promise((resolve, reject) => {
+ portListener = (port) => {
+ let numExpectedMessages = 2;
+ port.onMessage.addListener((msg) => {
+ numExpectedMessages -= 1;
+
+ if (numExpectedMessages == 1) {
+ assert.equal(msg, "content script->sdk port message",
+ "Got the expected message from the content script port");
+ port.postMessage("sdk->content script port message");
+ } else if (numExpectedMessages == 0) {
+ assert.equal(msg, "content script received sdk->content script port message",
+ "The content script received the expected port message");
+ }
+ });
+ port.onDisconnect.addListener(() => {
+ assert.equal(numExpectedMessages, 0, "Got the epected number of port messages");
+ resolve();
+ });
+ };
+ browser.runtime.onConnect.addListener(portListener);
+ });
+
+ let url = "data:text/html;charset=utf-8,Test Page
";
+
+ var openedTab;
+ tabs.once('open', function onOpen(tab) {
+ openedTab = tab;
+ });
+ tabs.open(url);
+
+ yield Promise.all([
+ waitForContentScriptMessage,
+ waitForContentScriptPort,
+ ]).then(() => {
+ browser.runtime.onMessage.removeListener(messageListener);
+ browser.runtime.onConnect.removeListener(portListener);
+ openedTab.close();
+ });
+ } catch (err) {
+ assert.fail(`Unexpected webextension startup exception: ${err} - ${err.stack}`);
+ }
+};
+
+require("sdk/test/runner").runTestsFromModule(module);
diff --git a/addon-sdk/source/test/addons/embedded-webextension/package.json b/addon-sdk/source/test/addons/embedded-webextension/package.json
new file mode 100644
index 000000000000..25dec41c3948
--- /dev/null
+++ b/addon-sdk/source/test/addons/embedded-webextension/package.json
@@ -0,0 +1,6 @@
+{
+ "id": "embedded-webextension@jetpack",
+ "version": "0.1.0",
+ "main": "./main.js",
+ "hasEmbeddedWebExtension": true
+}
diff --git a/addon-sdk/source/test/addons/embedded-webextension/webextension/background-page.js b/addon-sdk/source/test/addons/embedded-webextension/webextension/background-page.js
new file mode 100644
index 000000000000..05e7a613b57e
--- /dev/null
+++ b/addon-sdk/source/test/addons/embedded-webextension/webextension/background-page.js
@@ -0,0 +1,10 @@
+browser.runtime.sendMessage("bg->sdk message", (reply) => {
+ browser.runtime.sendMessage(reply);
+});
+
+let port = browser.runtime.connect();
+port.onMessage.addListener((msg) => {
+ port.postMessage(`bg received ${msg}`);
+ port.disconnect();
+});
+port.postMessage("bg->sdk port message");
diff --git a/addon-sdk/source/test/addons/embedded-webextension/webextension/content-script.js b/addon-sdk/source/test/addons/embedded-webextension/webextension/content-script.js
new file mode 100644
index 000000000000..a8770e623bc7
--- /dev/null
+++ b/addon-sdk/source/test/addons/embedded-webextension/webextension/content-script.js
@@ -0,0 +1,10 @@
+browser.runtime.sendMessage("content script->sdk message", (reply) => {
+ browser.runtime.sendMessage(reply);
+});
+
+let port = browser.runtime.connect();
+port.onMessage.addListener((msg) => {
+ port.postMessage(`content script received ${msg}`);
+ port.disconnect();
+});
+port.postMessage("content script->sdk port message");
diff --git a/addon-sdk/source/test/addons/embedded-webextension/webextension/manifest.json b/addon-sdk/source/test/addons/embedded-webextension/webextension/manifest.json
new file mode 100644
index 000000000000..d2188e7ba228
--- /dev/null
+++ b/addon-sdk/source/test/addons/embedded-webextension/webextension/manifest.json
@@ -0,0 +1,18 @@
+{
+ "name": "Test SDK Embedded WebExtension",
+ "description": "",
+ "version": "0.1.0",
+ "applications": {
+ "gecko": {
+ "id": "embedded-webextension@jetpack"
+ }
+ },
+ "manifest_version": 2,
+ "permissions": ["tabs"],
+ "background": {
+ "scripts": ["background-page.js"]
+ },
+ "content_scripts": [
+ {"matches": [""], "js": ["content-script.js"]}
+ ]
+}
diff --git a/addon-sdk/source/test/addons/jetpack-addon.ini b/addon-sdk/source/test/addons/jetpack-addon.ini
index 8112761ea611..64648607a707 100644
--- a/addon-sdk/source/test/addons/jetpack-addon.ini
+++ b/addon-sdk/source/test/addons/jetpack-addon.ini
@@ -17,6 +17,7 @@ skip-if = true
skip-if = true
[e10s-tabs.xpi]
skip-if = true
+[embedded-webextension.xpi]
[l10n.xpi]
[l10n-properties.xpi]
[layout-change.xpi]
diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index eebbef271ea0..20706fdd08a5 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -931,7 +931,9 @@ BrowserGlue.prototype = {
}
if (SCALING_PROBE_NAME) {
let scaling = aWindow.devicePixelRatio * 100;
- Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
+ try {
+ Services.telemetry.getHistogramById(SCALING_PROBE_NAME).add(scaling);
+ } catch (ex) {}
}
},
diff --git a/browser/components/search/content/search.xml b/browser/components/search/content/search.xml
index 433017ad06c4..1b47ac9b20b4 100644
--- a/browser/components/search/content/search.xml
+++ b/browser/components/search/content/search.xml
@@ -1290,8 +1290,8 @@
case "popuphidden":
Services.tm.mainThread.dispatch(() => {
this.selectedButton = null;
+ this._contextEngine = null;
}, Ci.nsIThread.DISPATCH_NORMAL);
- this._contextEngine = null;
break;
}
]]>
diff --git a/browser/components/search/test/browser.ini b/browser/components/search/test/browser.ini
index 4255c19c9006..9f76d90557fb 100644
--- a/browser/components/search/test/browser.ini
+++ b/browser/components/search/test/browser.ini
@@ -29,6 +29,7 @@ skip-if = os == "mac" # bug 967013
[browser_healthreport.js]
[browser_hiddenOneOffs_cleanup.js]
[browser_hiddenOneOffs_diacritics.js]
+[browser_oneOffContextMenu.js]
[browser_oneOffHeader.js]
[browser_private_search_perwindowpb.js]
[browser_yahoo.js]
diff --git a/browser/components/search/test/browser_oneOffContextMenu.js b/browser/components/search/test/browser_oneOffContextMenu.js
new file mode 100644
index 000000000000..eacab116cfc1
--- /dev/null
+++ b/browser/components/search/test/browser_oneOffContextMenu.js
@@ -0,0 +1,99 @@
+"use strict";
+
+const TEST_ENGINE_NAME = "Foo";
+const TEST_ENGINE_BASENAME = "testEngine.xml";
+
+const searchbar = document.getElementById("searchbar");
+const searchPopup = document.getElementById("PopupSearchAutoComplete");
+const searchIcon = document.getAnonymousElementByAttribute(
+ searchbar, "anonid", "searchbar-search-button"
+);
+const oneOffBinding = document.getAnonymousElementByAttribute(
+ searchPopup, "anonid", "search-one-off-buttons"
+);
+const contextMenu = document.getAnonymousElementByAttribute(
+ oneOffBinding, "anonid", "search-one-offs-context-menu"
+);
+const oneOffButtons = document.getAnonymousElementByAttribute(
+ oneOffBinding, "anonid", "search-panel-one-offs"
+);
+const searchInNewTabMenuItem = document.getAnonymousElementByAttribute(
+ oneOffBinding, "anonid", "search-one-offs-context-open-in-new-tab"
+);
+
+add_task(function* init() {
+ yield promiseNewEngine(TEST_ENGINE_BASENAME, {
+ setAsCurrent: false,
+ });
+});
+
+add_task(function* extendedTelemetryDisabled() {
+ yield SpecialPowers.pushPrefEnv({set: [["toolkit.telemetry.enabled", false]]});
+ yield doTest();
+ checkTelemetry("other");
+});
+
+add_task(function* extendedTelemetryEnabled() {
+ yield SpecialPowers.pushPrefEnv({set: [["toolkit.telemetry.enabled", true]]});
+ yield doTest();
+ checkTelemetry("other-" + TEST_ENGINE_NAME);
+});
+
+function* doTest() {
+ // Open the popup.
+ let promise = promiseEvent(searchPopup, "popupshown");
+ info("Opening search panel");
+ EventUtils.synthesizeMouseAtCenter(searchIcon, {});
+ yield promise;
+
+ // Get the one-off button for the test engine.
+ let oneOffButton;
+ for (let node of oneOffButtons.childNodes) {
+ if (node.engine && node.engine.name == TEST_ENGINE_NAME) {
+ oneOffButton = node;
+ break;
+ }
+ }
+ Assert.notEqual(oneOffButton, undefined,
+ "One-off for test engine should exist");
+
+ // Open the context menu on the one-off.
+ promise = BrowserTestUtils.waitForEvent(contextMenu, "popupshown");
+ EventUtils.synthesizeMouseAtCenter(oneOffButton, {
+ type: "contextmenu",
+ button: 2,
+ });
+ yield promise;
+
+ // Click the Search in New Tab menu item.
+ promise = BrowserTestUtils.waitForNewTab(gBrowser);
+ EventUtils.synthesizeMouseAtCenter(searchInNewTabMenuItem, {});
+ let tab = yield promise;
+
+ // Check the loaded tab.
+ Assert.equal(tab.linkedBrowser.currentURI.spec,
+ "http://mochi.test:8888/browser/browser/components/search/test/",
+ "Expected search tab should have loaded");
+
+ yield BrowserTestUtils.removeTab(tab);
+
+ // Move the cursor out of the panel area to avoid messing with other tests.
+ yield EventUtils.synthesizeNativeMouseMove(searchbar);
+}
+
+function checkTelemetry(expectedEngineName) {
+ let propertyPath = [
+ "countableEvents",
+ "__DEFAULT__",
+ "search-oneoff",
+ expectedEngineName + ".oneoff-context-searchbar",
+ "unknown",
+ "tab-background",
+ ];
+ let telem = BrowserUITelemetry.getToolbarMeasures();
+ for (let prop of propertyPath) {
+ Assert.ok(prop in telem, "Property " + prop + " should be in the telemetry");
+ telem = telem[prop];
+ }
+ Assert.equal(telem, 1, "Click count");
+}
diff --git a/devtools/client/debugger/new/bundle.js b/devtools/client/debugger/new/bundle.js
index 4f99c0ff0b08..aa6049aa08f7 100644
--- a/devtools/client/debugger/new/bundle.js
+++ b/devtools/client/debugger/new/bundle.js
@@ -1,4 +1,4 @@
-// Generated from: 30002d3cfc4341840af847af9eb2c31cab18abb5 Move some of editor-select.js test into editor-highlight.js to make tests more focused (and avoid timeouts on linux debug) (#746)
+// Generated from: 7c393c99dd82e9b181dab64ff474ee6ca9dc1c3f Revert "Add search input"
var Debugger =
/******/ (function(modules) { // webpackBootstrap
@@ -98,12 +98,12 @@ var Debugger =
var startDebugging = _require5.startDebugging;
var firefox = __webpack_require__(98);
- var configureStore = __webpack_require__(179);
- var reducers = __webpack_require__(187);
- var selectors = __webpack_require__(198);
+ var configureStore = __webpack_require__(180);
+ var reducers = __webpack_require__(188);
+ var selectors = __webpack_require__(199);
- var Tabs = __webpack_require__(205);
- var App = __webpack_require__(211);
+ var Tabs = __webpack_require__(206);
+ var App = __webpack_require__(212);
var createStore = configureStore({
log: getValue("logging.actions"),
@@ -113,7 +113,7 @@ var Debugger =
});
var store = createStore(combineReducers(reducers));
- var actions = bindActionCreators(__webpack_require__(213), store.dispatch);
+ var actions = bindActionCreators(__webpack_require__(214), store.dispatch);
if (isDevelopment()) {
AppConstants.DEBUG_JS_MODULES = true;
@@ -169,7 +169,7 @@ var Debugger =
});
} else if (isFirefoxPanel()) {
(function () {
- var sourceMap = __webpack_require__(215);
+ var sourceMap = __webpack_require__(216);
module.exports = {
bootstrap: _ref => {
@@ -178,8 +178,8 @@ var Debugger =
firefox.setThreadClient(threadClient);
firefox.setTabTarget(tabTarget);
- firefox.initPage(actions);
renderRoot(App);
+ return firefox.initPage(actions);
},
destroy: () => {
unmountRoot();
@@ -10174,7 +10174,7 @@ var Debugger =
var Task = _require.Task;
var firefox = __webpack_require__(98);
- var chrome = __webpack_require__(172);
+ var chrome = __webpack_require__(173);
var _require2 = __webpack_require__(45);
@@ -10326,6 +10326,10 @@ var Debugger =
var setupEvents = _require7.setupEvents;
var clientEvents = _require7.clientEvents;
+ var _require8 = __webpack_require__(172);
+
+ var createSource = _require8.createSource;
+
var debuggerClient = null;
var threadClient = null;
@@ -10418,16 +10422,24 @@ var Debugger =
threadClient.addListener(eventName, clientEvents[eventName]);
});
- threadClient.reconfigure({
- "useSourceMaps": false,
- "autoBlackBox": false
- });
+ // In Firefox, we need to initially request all of the sources. This
+ // usually fires off individual `newSource` notifications as the
+ // debugger finds them, but there may be existing sources already in
+ // the debugger (if it's paused already, or if loading the page from
+ // bfcache) so explicity fire `newSource` events for all returned
+ // sources.
+ return threadClient.getSources().then(_ref => {
+ var sources = _ref.sources;
- // In Firefox, we need to initially request all of the sources which
- // makes the server iterate over them and fire individual
- // `newSource` notifications. We don't need to do anything with the
- // response since `newSource` notifications are fired.
- threadClient.getSources();
+ actions.newSources(sources.map(createSource));
+
+ // If the threadClient is already paused, make sure to show a
+ // paused state.
+ var pausedPacket = threadClient.getLastPausePacket();
+ if (pausedPacket) {
+ clientEvents.paused(null, pausedPacket);
+ }
+ });
}
module.exports = {
@@ -19873,6 +19885,47 @@ var Debugger =
function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { return step("next", value); }, function (err) { return step("throw", err); }); } } return step("next"); }); }; }
+ var _require = __webpack_require__(172);
+
+ var createFrame = _require.createFrame;
+ var createSource = _require.createSource;
+
+
+ var CALL_STACK_PAGE_SIZE = 1000;
+
+ var threadClient = void 0;
+ var actions = void 0;
+
+ function setupEvents(dependencies) {
+ threadClient = dependencies.threadClient;
+ actions = dependencies.actions;
+ }
+
+ function resumed(_, packet) {
+ actions.resumed(packet);
+ }
+
+ function newSource(_, _ref2) {
+ var source = _ref2.source;
+
+ actions.newSource(createSource(source));
+ }
+
+ var clientEvents = {
+ paused,
+ resumed,
+ newSource
+ };
+
+ module.exports = {
+ setupEvents,
+ clientEvents
+ };
+
+/***/ },
+/* 172 */
+/***/ function(module, exports, __webpack_require__) {
+
var _require = __webpack_require__(114);
var Source = _require.Source;
@@ -19880,16 +19933,6 @@ var Debugger =
var Location = _require.Location;
- var CALL_STACK_PAGE_SIZE = 1000;
- var threadClient = void 0;
- var actions = void 0;
- var evalIndex = 1;
-
- function setupEvents(dependencies) {
- threadClient = dependencies.threadClient;
- actions = dependencies.actions;
- }
-
function createFrame(frame) {
var title = void 0;
if (frame.type == "call") {
@@ -19912,43 +19955,29 @@ var Debugger =
});
}
- function resumed(_, packet) {
- actions.resumed(packet);
- }
-
- function newSource(_, packet) {
- var source = packet.source;
-
+ var evalIndex = 1;
+ function createSource(source) {
if (!source.url) {
source.url = `SOURCE${ evalIndex++ }`;
}
- actions.newSource(Source({
+ return Source({
id: source.actor,
url: source.url,
isPrettyPrinted: false,
sourceMapURL: source.sourceMapURL
- }));
+ });
}
- var clientEvents = {
- paused,
- resumed,
- newSource
- };
-
- module.exports = {
- setupEvents,
- clientEvents
- };
+ module.exports = { createFrame, createSource };
/***/ },
-/* 172 */
+/* 173 */
/***/ function(module, exports, __webpack_require__) {
/* eslint-disable */
- var _require = __webpack_require__(173);
+ var _require = __webpack_require__(174);
var connect = _require.connect;
@@ -19963,16 +19992,16 @@ var Debugger =
var isEnabled = _require3.isEnabled;
var getValue = _require3.getValue;
- var _require4 = __webpack_require__(174);
+ var _require4 = __webpack_require__(175);
var networkRequest = _require4.networkRequest;
- var _require5 = __webpack_require__(177);
+ var _require5 = __webpack_require__(178);
var setupCommands = _require5.setupCommands;
var clientCommands = _require5.clientCommands;
- var _require6 = __webpack_require__(178);
+ var _require6 = __webpack_require__(179);
var setupEvents = _require6.setupEvents;
var clientEvents = _require6.clientEvents;
@@ -20062,16 +20091,16 @@ var Debugger =
};
/***/ },
-/* 173 */
+/* 174 */
/***/ function(module, exports) {
module.exports = {};
/***/ },
-/* 174 */
+/* 175 */
/***/ function(module, exports, __webpack_require__) {
- var _require = __webpack_require__(175);
+ var _require = __webpack_require__(176);
var log = _require.log;
@@ -20093,7 +20122,7 @@ var Debugger =
};
/***/ },
-/* 175 */
+/* 176 */
/***/ function(module, exports, __webpack_require__) {
var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
@@ -20136,7 +20165,7 @@ var Debugger =
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var co = __webpack_require__(176);
+ var co = __webpack_require__(177);
var _require = __webpack_require__(46);
@@ -20338,7 +20367,7 @@ var Debugger =
};
/***/ },
-/* 176 */
+/* 177 */
/***/ function(module, exports) {
@@ -20581,7 +20610,7 @@ var Debugger =
/***/ },
-/* 177 */
+/* 178 */
/***/ function(module, exports, __webpack_require__) {
var _require = __webpack_require__(114);
@@ -20705,7 +20734,7 @@ var Debugger =
};
/***/ },
-/* 178 */
+/* 179 */
/***/ function(module, exports, __webpack_require__) {
var paused = (() => {
@@ -20815,7 +20844,7 @@ var Debugger =
};
/***/ },
-/* 179 */
+/* 180 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -20828,23 +20857,23 @@ var Debugger =
var createStore = _require.createStore;
var applyMiddleware = _require.applyMiddleware;
- var _require2 = __webpack_require__(180);
+ var _require2 = __webpack_require__(181);
var waitUntilService = _require2.waitUntilService;
- var _require3 = __webpack_require__(181);
+ var _require3 = __webpack_require__(182);
var log = _require3.log;
- var _require4 = __webpack_require__(182);
+ var _require4 = __webpack_require__(183);
var history = _require4.history;
- var _require5 = __webpack_require__(183);
+ var _require5 = __webpack_require__(184);
var promise = _require5.promise;
- var _require6 = __webpack_require__(186);
+ var _require6 = __webpack_require__(187);
var thunk = _require6.thunk;
@@ -20892,7 +20921,7 @@ var Debugger =
module.exports = configureStore;
/***/ },
-/* 180 */
+/* 181 */
/***/ function(module, exports) {
/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -20962,7 +20991,7 @@ var Debugger =
/***/ },
-/* 181 */
+/* 182 */
/***/ function(module, exports) {
/**
@@ -20984,7 +21013,7 @@ var Debugger =
exports.log = log;
/***/ },
-/* 182 */
+/* 183 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -21018,22 +21047,22 @@ var Debugger =
};
/***/ },
-/* 183 */
+/* 184 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var uuidgen = __webpack_require__(184).uuid;
+ var uuidgen = __webpack_require__(185).uuid;
var defer = __webpack_require__(112);
- var _require = __webpack_require__(175);
+ var _require = __webpack_require__(176);
var entries = _require.entries;
var toObject = _require.toObject;
- var _require2 = __webpack_require__(185);
+ var _require2 = __webpack_require__(186);
var executeSoon = _require2.executeSoon;
@@ -21085,7 +21114,7 @@ var Debugger =
exports.promise = promiseMiddleware;
/***/ },
-/* 184 */
+/* 185 */
/***/ function(module, exports) {
@@ -21098,7 +21127,7 @@ var Debugger =
/***/ },
-/* 185 */
+/* 186 */
/***/ function(module, exports) {
function reportException(who, exception) {
@@ -21125,7 +21154,7 @@ var Debugger =
};
/***/ },
-/* 186 */
+/* 187 */
/***/ function(module, exports) {
@@ -21151,19 +21180,19 @@ var Debugger =
exports.thunk = thunk;
/***/ },
-/* 187 */
+/* 188 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var eventListeners = __webpack_require__(188);
- var sources = __webpack_require__(190);
- var breakpoints = __webpack_require__(194);
- var asyncRequests = __webpack_require__(195);
- var tabs = __webpack_require__(196);
- var pause = __webpack_require__(197);
+ var eventListeners = __webpack_require__(189);
+ var sources = __webpack_require__(191);
+ var breakpoints = __webpack_require__(195);
+ var asyncRequests = __webpack_require__(196);
+ var tabs = __webpack_require__(197);
+ var pause = __webpack_require__(198);
module.exports = {
eventListeners,
@@ -21175,14 +21204,14 @@ var Debugger =
};
/***/ },
-/* 188 */
+/* 189 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
var initialState = {
activeEventNames: [],
@@ -21219,7 +21248,7 @@ var Debugger =
module.exports = update;
/***/ },
-/* 189 */
+/* 190 */
/***/ function(module, exports) {
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
@@ -21267,7 +21296,7 @@ var Debugger =
exports.DELETE_EXPRESSION = "DELETE_EXPRESSION";
/***/ },
-/* 190 */
+/* 191 */
/***/ function(module, exports, __webpack_require__) {
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
@@ -21276,9 +21305,9 @@ var Debugger =
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var fromJS = __webpack_require__(191);
- var I = __webpack_require__(192);
- var makeRecord = __webpack_require__(193);
+ var fromJS = __webpack_require__(192);
+ var I = __webpack_require__(193);
+ var makeRecord = __webpack_require__(194);
var State = makeRecord({
sources: I.Map(),
@@ -21300,11 +21329,6 @@ var Debugger =
return state.mergeIn(["sources", action.source.id], _source);
}
- case "ADD_SOURCES":
- return state.mergeIn(["sources"], I.Map(action.sources.map(source => {
- return [source.id, fromJS(source)];
- })));
-
case "LOAD_SOURCE_MAP":
if (action.status == "done") {
return state.mergeIn(["sourceMaps", action.source.id], action.value.sourceMap);
@@ -21528,12 +21552,12 @@ var Debugger =
};
/***/ },
-/* 191 */
+/* 192 */
/***/ function(module, exports, __webpack_require__) {
- var Immutable = __webpack_require__(192);
+ var Immutable = __webpack_require__(193);
// When our app state is fully types, we should be able to get rid of
// this function. This is only temporarily necessary to support
@@ -21572,7 +21596,7 @@ var Debugger =
module.exports = fromJS;
/***/ },
-/* 192 */
+/* 193 */
/***/ function(module, exports, __webpack_require__) {
/**
@@ -26558,7 +26582,7 @@ var Debugger =
/***/ },
-/* 193 */
+/* 194 */
/***/ function(module, exports, __webpack_require__) {
@@ -26568,7 +26592,7 @@ var Debugger =
// because all the fields are actually typed, unlike the builtin one.
// This depends on a performance fix that will go out in 0.29 though;
- var I = __webpack_require__(192);
+ var I = __webpack_require__(193);
/**
* Make an immutable record type
@@ -26583,7 +26607,7 @@ var Debugger =
module.exports = makeRecord;
/***/ },
-/* 194 */
+/* 195 */
/***/ function(module, exports, __webpack_require__) {
@@ -26591,14 +26615,14 @@ var Debugger =
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var fromJS = __webpack_require__(191);
+ var fromJS = __webpack_require__(192);
- var _require = __webpack_require__(175);
+ var _require = __webpack_require__(176);
var updateObj = _require.updateObj;
- var I = __webpack_require__(192);
- var makeRecord = __webpack_require__(193);
+ var I = __webpack_require__(193);
+ var makeRecord = __webpack_require__(194);
var State = makeRecord({
breakpoints: I.Map(),
@@ -26772,7 +26796,7 @@ var Debugger =
};
/***/ },
-/* 195 */
+/* 196 */
/***/ function(module, exports, __webpack_require__) {
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
@@ -26781,7 +26805,7 @@ var Debugger =
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
var initialState = [];
function update() {
@@ -26809,16 +26833,16 @@ var Debugger =
module.exports = update;
/***/ },
-/* 196 */
+/* 197 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var constants = __webpack_require__(189);
- var Immutable = __webpack_require__(192);
- var fromJS = __webpack_require__(191);
+ var constants = __webpack_require__(190);
+ var Immutable = __webpack_require__(193);
+ var fromJS = __webpack_require__(192);
var initialState = fromJS({
tabs: {},
@@ -26864,15 +26888,15 @@ var Debugger =
module.exports = update;
/***/ },
-/* 197 */
+/* 198 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- var constants = __webpack_require__(189);
- var fromJS = __webpack_require__(191);
+ var constants = __webpack_require__(190);
+ var fromJS = __webpack_require__(192);
var initialState = fromJS({
pause: null,
@@ -27030,16 +27054,16 @@ var Debugger =
};
/***/ },
-/* 198 */
+/* 199 */
/***/ function(module, exports, __webpack_require__) {
- var URL = __webpack_require__(199);
- var path = __webpack_require__(204);
- var sources = __webpack_require__(190);
- var pause = __webpack_require__(197);
- var breakpoints = __webpack_require__(194);
+ var URL = __webpack_require__(200);
+ var path = __webpack_require__(205);
+ var sources = __webpack_require__(191);
+ var pause = __webpack_require__(198);
+ var breakpoints = __webpack_require__(195);
function getTabs(state) {
return state.tabs.get("tabs");
@@ -27104,7 +27128,7 @@ var Debugger =
};
/***/ },
-/* 199 */
+/* 200 */
/***/ function(module, exports, __webpack_require__) {
// Copyright Joyent, Inc. and other Node contributors.
@@ -27128,7 +27152,7 @@ var Debugger =
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.
- var punycode = __webpack_require__(200);
+ var punycode = __webpack_require__(201);
exports.parse = urlParse;
exports.resolve = urlResolve;
@@ -27200,7 +27224,7 @@ var Debugger =
'gopher:': true,
'file:': true
},
- querystring = __webpack_require__(201);
+ querystring = __webpack_require__(202);
function urlParse(url, parseQueryString, slashesDenoteHost) {
if (url && isObject(url) && url instanceof Url) return url;
@@ -27817,7 +27841,7 @@ var Debugger =
/***/ },
-/* 200 */
+/* 201 */
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(module, global) {/*! https://mths.be/punycode v1.3.2 by @mathias */
@@ -28352,17 +28376,17 @@ var Debugger =
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(101)(module), (function() { return this; }())))
/***/ },
-/* 201 */
+/* 202 */
/***/ function(module, exports, __webpack_require__) {
'use strict';
- exports.decode = exports.parse = __webpack_require__(202);
- exports.encode = exports.stringify = __webpack_require__(203);
+ exports.decode = exports.parse = __webpack_require__(203);
+ exports.encode = exports.stringify = __webpack_require__(204);
/***/ },
-/* 202 */
+/* 203 */
/***/ function(module, exports) {
// Copyright Joyent, Inc. and other Node contributors.
@@ -28448,7 +28472,7 @@ var Debugger =
/***/ },
-/* 203 */
+/* 204 */
/***/ function(module, exports) {
// Copyright Joyent, Inc. and other Node contributors.
@@ -28518,7 +28542,7 @@ var Debugger =
/***/ },
-/* 204 */
+/* 205 */
/***/ function(module, exports) {
function basename(path) {
@@ -28543,7 +28567,7 @@ var Debugger =
};
/***/ },
-/* 205 */
+/* 206 */
/***/ function(module, exports, __webpack_require__) {
var React = __webpack_require__(17);
@@ -28552,14 +28576,14 @@ var Debugger =
var connect = _require.connect;
- var classnames = __webpack_require__(206);
+ var classnames = __webpack_require__(207);
- var _require2 = __webpack_require__(198);
+ var _require2 = __webpack_require__(199);
var getTabs = _require2.getTabs;
- __webpack_require__(207);
+ __webpack_require__(208);
var dom = React.DOM;
var githubUrl = "https://github.com/devtools-html/debugger.html/blob/master";
@@ -28597,7 +28621,7 @@ var Debugger =
module.exports = connect(state => ({ tabs: getTabs(state) }))(Tabs);
/***/ },
-/* 206 */
+/* 207 */
/***/ function(module, exports, __webpack_require__) {
var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
@@ -28651,16 +28675,16 @@ var Debugger =
/***/ },
-/* 207 */
+/* 208 */
/***/ function(module, exports) {
// removed by extract-text-webpack-plugin
/***/ },
-/* 208 */,
/* 209 */,
/* 210 */,
-/* 211 */
+/* 211 */,
+/* 212 */
/***/ function(module, exports, __webpack_require__) {
var React = __webpack_require__(17);
@@ -28676,19 +28700,19 @@ var Debugger =
var bindActionCreators = _require2.bindActionCreators;
- var _require3 = __webpack_require__(212);
+ var _require3 = __webpack_require__(213);
var Services = _require3.Services;
- var classnames = __webpack_require__(206);
- var actions = __webpack_require__(213);
+ var classnames = __webpack_require__(207);
+ var actions = __webpack_require__(214);
var _require4 = __webpack_require__(46);
var isFirefoxPanel = _require4.isFirefoxPanel;
- __webpack_require__(224);
+ __webpack_require__(225);
// Using this static variable allows webpack to know at compile-time
// to avoid this require and not include it at all in the output.
@@ -28696,29 +28720,29 @@ var Debugger =
require("../lib/themes/light-theme.css");
}
- var Sources = createFactory(__webpack_require__(226));
- var Editor = createFactory(__webpack_require__(261));
- var SplitBox = createFactory(__webpack_require__(266));
- var RightSidebar = createFactory(__webpack_require__(270));
- var SourceTabs = createFactory(__webpack_require__(347));
- var SourceFooter = createFactory(__webpack_require__(352));
- var Svg = __webpack_require__(234);
- var Autocomplete = createFactory(__webpack_require__(355));
+ var Sources = createFactory(__webpack_require__(227));
+ var Editor = createFactory(__webpack_require__(262));
+ var SplitBox = createFactory(__webpack_require__(267));
+ var RightSidebar = createFactory(__webpack_require__(271));
+ var SourceTabs = createFactory(__webpack_require__(348));
+ var SourceFooter = createFactory(__webpack_require__(353));
+ var Svg = __webpack_require__(235);
+ var Autocomplete = createFactory(__webpack_require__(356));
- var _require5 = __webpack_require__(198);
+ var _require5 = __webpack_require__(199);
var getSources = _require5.getSources;
var getSelectedSource = _require5.getSelectedSource;
- var _require6 = __webpack_require__(175);
+ var _require6 = __webpack_require__(176);
var endTruncateStr = _require6.endTruncateStr;
- var _require7 = __webpack_require__(364);
+ var _require7 = __webpack_require__(365);
var KeyShortcuts = _require7.KeyShortcuts;
- var _require8 = __webpack_require__(229);
+ var _require8 = __webpack_require__(230);
var isHiddenSource = _require8.isHiddenSource;
var getURL = _require8.getURL;
@@ -28820,7 +28844,7 @@ var Debugger =
selectedSource: getSelectedSource(state) }), dispatch => bindActionCreators(actions, dispatch))(App);
/***/ },
-/* 212 */
+/* 213 */
/***/ function(module, exports) {
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
@@ -29435,22 +29459,22 @@ var Debugger =
/***/ },
-/* 213 */
+/* 214 */
/***/ function(module, exports, __webpack_require__) {
- var breakpoints = __webpack_require__(214);
- var eventListeners = __webpack_require__(217);
- var sources = __webpack_require__(218);
- var tabs = __webpack_require__(221);
- var pause = __webpack_require__(222);
- var navigation = __webpack_require__(223);
+ var breakpoints = __webpack_require__(215);
+ var eventListeners = __webpack_require__(218);
+ var sources = __webpack_require__(219);
+ var tabs = __webpack_require__(222);
+ var pause = __webpack_require__(223);
+ var navigation = __webpack_require__(224);
module.exports = Object.assign(navigation, breakpoints, eventListeners, sources, tabs, pause);
/***/ },
-/* 214 */
+/* 215 */
/***/ function(module, exports, __webpack_require__) {
var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
@@ -29466,18 +29490,18 @@ var Debugger =
* @module actions/breakpoints
*/
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
- var _require = __webpack_require__(183);
+ var _require = __webpack_require__(184);
var PROMISE = _require.PROMISE;
- var _require2 = __webpack_require__(198);
+ var _require2 = __webpack_require__(199);
var getBreakpoint = _require2.getBreakpoint;
var getBreakpoints = _require2.getBreakpoints;
- var _require3 = __webpack_require__(215);
+ var _require3 = __webpack_require__(216);
var getOriginalLocation = _require3.getOriginalLocation;
var getGeneratedLocation = _require3.getGeneratedLocation;
@@ -29697,7 +29721,7 @@ var Debugger =
};
/***/ },
-/* 215 */
+/* 216 */
/***/ function(module, exports, __webpack_require__) {
var getOriginalSources = (() => {
@@ -29795,16 +29819,16 @@ var Debugger =
function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { return step("next", value); }, function (err) { return step("throw", err); }); } } return step("next"); }); }; }
- var _require = __webpack_require__(175);
+ var _require = __webpack_require__(176);
var workerTask = _require.workerTask;
- var _require2 = __webpack_require__(216);
+ var _require2 = __webpack_require__(217);
var makeOriginalSource = _require2.makeOriginalSource;
var getGeneratedSourceId = _require2.getGeneratedSourceId;
- var _require3 = __webpack_require__(198);
+ var _require3 = __webpack_require__(199);
var getSource = _require3.getSource;
var getSourceByURL = _require3.getSourceByURL;
@@ -29899,7 +29923,7 @@ var Debugger =
};
/***/ },
-/* 216 */
+/* 217 */
/***/ function(module, exports) {
@@ -29928,7 +29952,7 @@ var Debugger =
};
/***/ },
-/* 217 */
+/* 218 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -29942,13 +29966,13 @@ var Debugger =
* @module actions/event-listeners
*/
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
- var _require = __webpack_require__(175);
+ var _require = __webpack_require__(176);
var asPaused = _require.asPaused;
- var _require2 = __webpack_require__(185);
+ var _require2 = __webpack_require__(186);
var reportException = _require2.reportException;
@@ -30072,7 +30096,7 @@ var Debugger =
module.exports = { updateEventBreakpoints, fetchEventListeners };
/***/ },
-/* 218 */
+/* 219 */
/***/ function(module, exports, __webpack_require__) {
var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"]) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }();
@@ -30128,7 +30152,7 @@ var Debugger =
var defer = __webpack_require__(112);
- var _require = __webpack_require__(183);
+ var _require = __webpack_require__(184);
var PROMISE = _require.PROMISE;
@@ -30136,31 +30160,31 @@ var Debugger =
var Task = _require2.Task;
- var _require3 = __webpack_require__(219);
+ var _require3 = __webpack_require__(220);
var isJavaScript = _require3.isJavaScript;
- var _require4 = __webpack_require__(174);
+ var _require4 = __webpack_require__(175);
var networkRequest = _require4.networkRequest;
- var _require5 = __webpack_require__(175);
+ var _require5 = __webpack_require__(176);
var workerTask = _require5.workerTask;
- var _require6 = __webpack_require__(220);
+ var _require6 = __webpack_require__(221);
var updateFrameLocations = _require6.updateFrameLocations;
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
var invariant = __webpack_require__(24);
var _require7 = __webpack_require__(46);
var isEnabled = _require7.isEnabled;
- var _require8 = __webpack_require__(215);
+ var _require8 = __webpack_require__(216);
var createOriginalSources = _require8.createOriginalSources;
var getOriginalSourceTexts = _require8.getOriginalSourceTexts;
@@ -30168,7 +30192,7 @@ var Debugger =
var makeOriginalSource = _require8.makeOriginalSource;
var getGeneratedSource = _require8.getGeneratedSource;
- var _require9 = __webpack_require__(198);
+ var _require9 = __webpack_require__(199);
var getSource = _require9.getSource;
var getSourceByURL = _require9.getSourceByURL;
@@ -30183,13 +30207,6 @@ var Debugger =
return isEnabled("sourceMaps") && generatedSource.sourceMapURL;
}
- function _addSource(source) {
- return {
- type: constants.ADD_SOURCE,
- source
- };
- }
-
function newSource(source) {
return _ref4 => {
var dispatch = _ref4.dispatch;
@@ -30199,7 +30216,10 @@ var Debugger =
dispatch(loadSourceMap(source));
}
- dispatch(_addSource(source));
+ dispatch({
+ type: constants.ADD_SOURCE,
+ source
+ });
// If a request has been made to show this source, go ahead and
// select it.
@@ -30210,14 +30230,23 @@ var Debugger =
};
}
+ function newSources(sources) {
+ return _ref5 => {
+ var dispatch = _ref5.dispatch;
+ var getState = _ref5.getState;
+
+ sources.filter(source => !getSource(getState(), source.id)).forEach(source => dispatch(newSource(source)));
+ };
+ }
+
/**
* @memberof actions/sources
* @static
*/
function loadSourceMap(generatedSource) {
- return _ref5 => {
- var dispatch = _ref5.dispatch;
- var getState = _ref5.getState;
+ return _ref6 => {
+ var dispatch = _ref6.dispatch;
+ var getState = _ref6.getState;
var sourceMap = getSourceMap(getState(), generatedSource.id);
if (sourceMap) {
@@ -30255,9 +30284,9 @@ var Debugger =
function selectSourceURL(url) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
- return _ref7 => {
- var dispatch = _ref7.dispatch;
- var getState = _ref7.getState;
+ return _ref8 => {
+ var dispatch = _ref8.dispatch;
+ var getState = _ref8.getState;
var source = getSourceByURL(getState(), url);
if (source) {
@@ -30280,10 +30309,10 @@ var Debugger =
function selectSource(id) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
- return _ref8 => {
- var dispatch = _ref8.dispatch;
- var getState = _ref8.getState;
- var client = _ref8.client;
+ return _ref9 => {
+ var dispatch = _ref9.dispatch;
+ var getState = _ref9.getState;
+ var client = _ref9.client;
if (!client) {
// No connection, do nothing. This happens when the debugger is
@@ -30330,9 +30359,9 @@ var Debugger =
* [aSource, error].
*/
function blackbox(source, shouldBlackBox) {
- return _ref9 => {
- var dispatch = _ref9.dispatch;
- var client = _ref9.client;
+ return _ref10 => {
+ var dispatch = _ref10.dispatch;
+ var client = _ref10.client;
dispatch({
type: constants.BLACKBOX,
@@ -30360,10 +30389,10 @@ var Debugger =
* [aSource, error].
*/
function togglePrettyPrint(id) {
- return _ref10 => {
- var dispatch = _ref10.dispatch;
- var getState = _ref10.getState;
- var client = _ref10.client;
+ return _ref11 => {
+ var dispatch = _ref11.dispatch;
+ var getState = _ref11.getState;
+ var client = _ref11.client;
var source = getSource(getState(), id).toJS();
var sourceText = getSourceText(getState(), id).toJS();
@@ -30378,7 +30407,10 @@ var Debugger =
var url = source.url + ":formatted";
var originalSource = makeOriginalSource({ url, source });
- dispatch(_addSource(originalSource));
+ dispatch({
+ type: constants.ADD_SOURCE,
+ source: originalSource
+ });
return dispatch({
type: constants.TOGGLE_PRETTY_PRINT,
@@ -30412,10 +30444,10 @@ var Debugger =
* @static
*/
function loadSourceText(source) {
- return _ref12 => {
- var dispatch = _ref12.dispatch;
- var getState = _ref12.getState;
- var client = _ref12.client;
+ return _ref13 => {
+ var dispatch = _ref13.dispatch;
+ var getState = _ref13.getState;
+ var client = _ref13.client;
// Fetch the source text only once.
var textInfo = getSourceText(getState(), source.id);
@@ -30472,9 +30504,9 @@ var Debugger =
* A promise that is resolved after source texts have been fetched.
*/
function getTextForSources(actors) {
- return _ref14 => {
- var dispatch = _ref14.dispatch;
- var getState = _ref14.getState;
+ return _ref15 => {
+ var dispatch = _ref15.dispatch;
+ var getState = _ref15.getState;
var deferred = defer();
var pending = new Set(actors);
@@ -30489,9 +30521,9 @@ var Debugger =
var _loop = function (actor) {
var source = getSource(getState(), actor);
- dispatch(loadSourceText(source)).then(_ref23 => {
- var text = _ref23.text;
- var contentType = _ref23.contentType;
+ dispatch(loadSourceText(source)).then(_ref24 => {
+ var text = _ref24.text;
+ var contentType = _ref24.contentType;
onFetch([source, text, contentType]);
}, err => {
@@ -30512,12 +30544,12 @@ var Debugger =
}
/* Called if fetching a source finishes successfully. */
- function onFetch(_ref15) {
- var _ref16 = _slicedToArray(_ref15, 3);
+ function onFetch(_ref16) {
+ var _ref17 = _slicedToArray(_ref16, 3);
- var aSource = _ref16[0];
- var aText = _ref16[1];
- var aContentType = _ref16[2];
+ var aSource = _ref17[0];
+ var aText = _ref17[1];
+ var aContentType = _ref17[2];
// If fetching the source has previously timed out, discard it this time.
if (!pending.has(aSource.actor)) {
@@ -30529,11 +30561,11 @@ var Debugger =
}
/* Called if fetching a source failed because of an error. */
- function onError(_ref17) {
- var _ref18 = _slicedToArray(_ref17, 2);
+ function onError(_ref18) {
+ var _ref19 = _slicedToArray(_ref18, 2);
- var aSource = _ref18[0];
- var aError = _ref18[1];
+ var aSource = _ref19[0];
+ var aError = _ref19[1];
pending.delete(aSource.actor);
maybeFinish();
@@ -30545,14 +30577,14 @@ var Debugger =
function maybeFinish() {
if (pending.size == 0) {
// Sort the fetched sources alphabetically by their url.
- deferred.resolve(fetched.sort((_ref19, _ref20) => {
- var _ref22 = _slicedToArray(_ref19, 1);
+ deferred.resolve(fetched.sort((_ref20, _ref21) => {
+ var _ref23 = _slicedToArray(_ref20, 1);
- var aFirst = _ref22[0];
+ var aFirst = _ref23[0];
- var _ref21 = _slicedToArray(_ref20, 1);
+ var _ref22 = _slicedToArray(_ref21, 1);
- var aSecond = _ref21[0];
+ var aSecond = _ref22[0];
return aFirst > aSecond;
}));
}
@@ -30564,6 +30596,7 @@ var Debugger =
module.exports = {
newSource,
+ newSources,
selectSource,
selectSourceURL,
closeTab,
@@ -30574,7 +30607,7 @@ var Debugger =
};
/***/ },
-/* 219 */
+/* 220 */
/***/ function(module, exports) {
@@ -30617,7 +30650,7 @@ var Debugger =
};
/***/ },
-/* 220 */
+/* 221 */
/***/ function(module, exports, __webpack_require__) {
var updateFrameLocation = (() => {
@@ -30653,11 +30686,11 @@ var Debugger =
var Location = _require.Location;
var Frame = _require.Frame;
- var _require2 = __webpack_require__(215);
+ var _require2 = __webpack_require__(216);
var getOriginalLocation = _require2.getOriginalLocation;
- var _require3 = __webpack_require__(175);
+ var _require3 = __webpack_require__(176);
var asyncMap = _require3.asyncMap;
@@ -30667,7 +30700,7 @@ var Debugger =
};
/***/ },
-/* 221 */
+/* 222 */
/***/ function(module, exports, __webpack_require__) {
/* This Source Code Form is subject to the terms of the Mozilla Public
@@ -30680,7 +30713,7 @@ var Debugger =
* @module actions/tabs
*/
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
/**
* @typedef {Object} TabAction
@@ -30724,26 +30757,26 @@ var Debugger =
};
/***/ },
-/* 222 */
+/* 223 */
/***/ function(module, exports, __webpack_require__) {
function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { return step("next", value); }, function (err) { return step("throw", err); }); } } return step("next"); }); }; }
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
- var _require = __webpack_require__(218);
+ var _require = __webpack_require__(219);
var selectSource = _require.selectSource;
- var _require2 = __webpack_require__(183);
+ var _require2 = __webpack_require__(184);
var PROMISE = _require2.PROMISE;
- var _require3 = __webpack_require__(198);
+ var _require3 = __webpack_require__(199);
var getExpressions = _require3.getExpressions;
- var _require4 = __webpack_require__(220);
+ var _require4 = __webpack_require__(221);
var updateFrameLocations = _require4.updateFrameLocations;
@@ -31052,12 +31085,12 @@ var Debugger =
};
/***/ },
-/* 223 */
+/* 224 */
/***/ function(module, exports, __webpack_require__) {
- var constants = __webpack_require__(189);
+ var constants = __webpack_require__(190);
- var _require = __webpack_require__(215);
+ var _require = __webpack_require__(216);
var clearData = _require.clearData;
@@ -31101,21 +31134,21 @@ var Debugger =
};
/***/ },
-/* 224 */
+/* 225 */
/***/ function(module, exports) {
// removed by extract-text-webpack-plugin
/***/ },
-/* 225 */,
-/* 226 */
+/* 226 */,
+/* 227 */
/***/ function(module, exports, __webpack_require__) {
var React = __webpack_require__(17);
var dom = React.DOM;
var PropTypes = React.PropTypes;
- var ImPropTypes = __webpack_require__(227);
+ var ImPropTypes = __webpack_require__(228);
var _require = __webpack_require__(2);
@@ -31125,16 +31158,16 @@ var Debugger =
var connect = _require2.connect;
- var SourcesTree = React.createFactory(__webpack_require__(228));
- var actions = __webpack_require__(213);
+ var SourcesTree = React.createFactory(__webpack_require__(229));
+ var actions = __webpack_require__(214);
- var _require3 = __webpack_require__(198);
+ var _require3 = __webpack_require__(199);
var getSelectedSource = _require3.getSelectedSource;
var getSources = _require3.getSources;
- __webpack_require__(259);
+ __webpack_require__(260);
var Sources = React.createClass({
propTypes: {
@@ -31158,7 +31191,7 @@ var Debugger =
sources: getSources(state) }), dispatch => bindActionCreators(actions, dispatch))(Sources);
/***/ },
-/* 227 */
+/* 228 */
/***/ function(module, exports, __webpack_require__) {
/**
@@ -31169,7 +31202,7 @@ var Debugger =
*/
"use strict";
- var Immutable = __webpack_require__(192);
+ var Immutable = __webpack_require__(193);
var ANONYMOUS = "<