Bug 994844 - Remove Task.spawn() usage from CustomizeMode.populatePalette() r=mconley

This commit is contained in:
Tim Taubert 2014-04-10 19:45:33 +02:00
Родитель 4b94d9aec4
Коммит 06e129d0fd
1 изменённых файлов: 7 добавлений и 5 удалений

Просмотреть файл

@ -234,7 +234,7 @@ CustomizeMode.prototype = {
this._showPanelCustomizationPlaceholders(); this._showPanelCustomizationPlaceholders();
yield this._wrapToolbarItems(); yield this._wrapToolbarItems();
yield this.populatePalette(); this.populatePalette();
this.visiblePalette.addEventListener("dragstart", this, true); this.visiblePalette.addEventListener("dragstart", this, true);
this.visiblePalette.addEventListener("dragover", this, true); this.visiblePalette.addEventListener("dragover", this, true);
@ -647,7 +647,7 @@ CustomizeMode.prototype = {
let fragment = this.document.createDocumentFragment(); let fragment = this.document.createDocumentFragment();
let toolboxPalette = this.window.gNavToolbox.palette; let toolboxPalette = this.window.gNavToolbox.palette;
return Task.spawn(function() { try {
let unusedWidgets = CustomizableUI.getUnusedWidgets(toolboxPalette); let unusedWidgets = CustomizableUI.getUnusedWidgets(toolboxPalette);
for (let widget of unusedWidgets) { for (let widget of unusedWidgets) {
let paletteItem = this.makePaletteItem(widget, "palette"); let paletteItem = this.makePaletteItem(widget, "palette");
@ -657,7 +657,9 @@ CustomizeMode.prototype = {
this.visiblePalette.appendChild(fragment); this.visiblePalette.appendChild(fragment);
this._stowedPalette = this.window.gNavToolbox.palette; this._stowedPalette = this.window.gNavToolbox.palette;
this.window.gNavToolbox.palette = this.visiblePalette; this.window.gNavToolbox.palette = this.visiblePalette;
}.bind(this)).then(null, ERROR); } catch (ex) {
ERROR(ex);
}
}, },
//XXXunf Maybe this should use -moz-element instead of wrapping the node? //XXXunf Maybe this should use -moz-element instead of wrapping the node?
@ -985,7 +987,7 @@ CustomizeMode.prototype = {
CustomizableUI.reset(); CustomizableUI.reset();
yield this._wrapToolbarItems(); yield this._wrapToolbarItems();
yield this.populatePalette(); this.populatePalette();
this.persistCurrentSets(true); this.persistCurrentSets(true);
@ -1011,7 +1013,7 @@ CustomizeMode.prototype = {
CustomizableUI.undoReset(); CustomizableUI.undoReset();
yield this._wrapToolbarItems(); yield this._wrapToolbarItems();
yield this.populatePalette(); this.populatePalette();
this.persistCurrentSets(true); this.persistCurrentSets(true);