Bug 1451014 - Remove iterator to list toolboxes on gDevTools;r=ochameau
MozReview-Commit-ID: 5ZaePP4p5Eb
--- a/devtools/client/framework/devtools.js
+++ b/devtools/client/framework/devtools.js
@@ -700,20 +700,11 @@ DevTools.prototype = {
* Returns the array of the existing toolboxes.
*
* @return {Array<Toolbox>}
* An array of toolboxes.
*/
getToolboxes() {
return Array.from(this._toolboxes.values());
},
-
- /**
- * Iterator that yields each of the toolboxes.
- */
- * [Symbol.iterator ]() {
- for (let toolbox of this._toolboxes) {
- yield toolbox;
- }
- }
};
const gDevTools = exports.gDevTools = new DevTools();
--- a/devtools/client/framework/gDevTools.jsm
+++ b/devtools/client/framework/gDevTools.jsm
@@ -88,21 +88,16 @@ let gDevToolsMethods = [
this.gDevTools = {
// Used by tests
get _toolboxes() {
return devtools._toolboxes;
},
get _tools() {
return devtools._tools;
},
- * [Symbol.iterator ]() {
- for (let toolbox of this._toolboxes) {
- yield toolbox;
- }
- }
};
gDevToolsMethods.forEach(name => {
this.gDevTools[name] = (...args) => {
return devtools[name].apply(devtools, args);
};
});
/**
--- a/devtools/client/shared/view-source.js
+++ b/devtools/client/shared/view-source.js
@@ -138,17 +138,17 @@ exports.viewSourceInScratchpad = async f
if (!win.closed && win.Scratchpad.uniqueName === sourceURL) {
win.focus();
win.Scratchpad.editor.setCursor({ line: sourceLine, ch: 0 });
return;
}
}
// For scratchpads within toolbox
- for (let [, toolbox] of gDevTools) {
+ for (let toolbox of gDevTools.getToolboxes()) {
let scratchpadPanel = toolbox.getPanel("scratchpad");
if (scratchpadPanel) {
let { scratchpad } = scratchpadPanel;
if (scratchpad.uniqueName === sourceURL) {
toolbox.selectTool("scratchpad");
toolbox.raise();
scratchpad.editor.focus();
scratchpad.editor.setCursor({ line: sourceLine, ch: 0 });