Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 818432 - this.tracked browser windows.delete is undefined; r=paul

Browse Source
This commit is contained in:
Joe Walker 2013-01-11 12:16:24 +00:00
parent 165306d0b2
commit 71f8030481
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/devtools/framework/Toolbox.jsm
View File

@ -248,11 +248,6 @@ Toolbox.prototype = {
let domReady = function() {
iframe.removeEventListener("DOMContentLoaded", domReady, true);
let vbox = this.doc.getElementById("toolbox-panel-" + this._currentToolId);
if (vbox) {
this.doc.commandDispatcher.advanceFocusIntoSubtree(vbox);
}
this.isReady = true;
let closeButton = this.doc.getElementById("toolbox-close");

27
browser/devtools/framework/gDevTools.jsm
View File

@ -25,8 +25,8 @@ const FORBIDDEN_IDS = new Set("toolbox", "");
* set of tools and keeps track of open toolboxes in the browser.
*/
this.DevTools = function DevTools() {
this._tools = new Map();
this._toolboxes = new Map();
this._tools = new Map(); // Map<toolId, tool>
this._toolboxes = new Map(); // Map<target, toolbox>
// destroy() is an observer's handler so we need to preserve context.
this.destroy = this.destroy.bind(this);
@ -85,11 +85,16 @@ DevTools.prototype = {
*
* @param {string} toolId
* id of the tool to unregister
* @param {boolean} isQuitApplication
* true to indicate that the call is due to app quit, so we should not
* cause a cascade of costly events
*/
unregisterTool: function DT_unregisterTool(toolId) {
unregisterTool: function DT_unregisterTool(toolId, isQuitApplication) {
this._tools.delete(toolId);
this.emit("tool-unregistered", toolId);
if (!isQuitApplication) {
this.emit("tool-unregistered", toolId);
}
},
/**
@ -218,8 +223,13 @@ DevTools.prototype = {
destroy: function() {
Services.obs.removeObserver(this.destroy, "quit-application");
delete this._trackedBrowserWindows;
delete this._toolboxes;
for (let [key, tool] of this._tools) {
this.unregisterTool(key, true);
}
// Cleaning down the toolboxes: i.e.
// for (let [target, toolbox] of this._toolboxes) toolbox.destroy();
// Is taken care of by the gDevToolsBrowser.forgetBrowserWindow
},
};
@ -534,10 +544,6 @@ let gDevToolsBrowser = {
* The window containing the menu entry
*/
forgetBrowserWindow: function DT_forgetBrowserWindow(win) {
if (!gDevToolsBrowser._trackedBrowserWindows) {
return;
}
gDevToolsBrowser._trackedBrowserWindows.delete(win);
// Destroy toolboxes for closed window
@ -557,7 +563,6 @@ let gDevToolsBrowser = {
*/
destroy: function() {
Services.obs.removeObserver(gDevToolsBrowser.destroy, "quit-application");
delete gDevToolsBrowser._trackedBrowserWindows;
},
}
this.gDevToolsBrowser = gDevToolsBrowser;