Bug 869349 - When customization is finished, persist toolbar currentsets after unwrapping them - not before. r=jaws.

This commit is contained in:
Mike Conley 2013-05-09 12:00:31 -04:00
parent a3cc32d761
commit a3ffe58760

View File

@ -170,14 +170,6 @@ CustomizeMode.prototype = {
let window = this.window;
let document = this.document;
if (this._changed) {
// XXXmconley: At first, it seems strange to also persist the old way with
// currentset - but this might actually be useful for switching
// to old builds. We might want to keep this around for a little
// bit.
this.persistCurrentSets();
}
document.documentElement.removeAttribute("customizing");
for (let target of this.areas) {
@ -192,6 +184,14 @@ CustomizeMode.prototype = {
target.removeEventListener("drop", this);
}
if (this._changed) {
// XXXmconley: At first, it seems strange to also persist the old way with
// currentset - but this might actually be useful for switching
// to old builds. We might want to keep this around for a little
// bit.
this.persistCurrentSets();
}
// And drop all area references.
this.areas = [];