Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1239287 - Wait for attachTab request during Options panel initialization. r=jryans

Browse Source
This commit is contained in:
Alexandre Poirot 2016-01-25 06:06:48 -08:00
parent 7ccd002317
commit 5625eaf729
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devtools/client/framework/toolbox-options.js
View File

@ -108,8 +108,9 @@ OptionsPanel.prototype = {
this.setupToolsList();
this.setupToolbarButtonsList();
this.setupThemeList();
this.populatePreferences();
this.updateDefaultTheme();
}).then(() => {
return this.populatePreferences();
}).then(() => {
this.isReady = true;
this.emit("ready");
@ -315,7 +316,7 @@ OptionsPanel.prototype = {
}
if (this.target.activeTab) {
this.target.client.attachTab(this.target.activeTab._actor, (response) => {
return this.target.client.attachTab(this.target.activeTab._actor).then(([response,client]) => {
this._origJavascriptEnabled = !response.javascriptEnabled;
this.disableJSNode.checked = this._origJavascriptEnabled;
this.disableJSNode.addEventListener("click", this._disableJSClicked, false);