wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 770135 - Make it so that programmatically generated widgets behave properly when customizing. r=Unfocused.

Browse Source
This commit is contained in:
Mike Conley 2013-03-22 15:15:58 -04:00
parent 5423d07137
commit 991ca5a608
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browser/modules/CustomizableUI.jsm
View File

@ -401,6 +401,14 @@ let CustomizableUIInternal = {
let widget = gPalette.get(aWidgetId);
if (widget) {
// If we have an instance of this widget already, just use that.
if (widget.instances.has(aDocument)) {
LOG("An instance of widget " + aWidgetId + " already exists in this "
+ "document. Reusing.");
return [ CustomizableUI.PROVIDER_API,
widget.instances.get(aDocument) ];
}
return [ CustomizableUI.PROVIDER_API,
this.buildWidget(aDocument, null, widget) ];
}
@ -489,7 +497,7 @@ let CustomizableUIInternal = {
if (!areaNodes) {
return;
}
for (let areaNode of areaNodes) {
let container = areaNode.customizationTarget;
let widgetNode = container.ownerDocument.getElementById(aWidgetId);

26
browser/modules/CustomizeMode.jsm
View File

@ -55,11 +55,11 @@ CustomizeMode.prototype = {
_stowedPalette: null,
enter: function() {
CustomizableUI.addListener(this);
let window = this.window;
let document = this.document;
CustomizableUI.addListener(this);
// Let everybody in this window know that we're about to customize.
let evt = document.createEvent("CustomEvent");
evt.initCustomEvent("CustomizationStart", true, true, window);
@ -220,7 +220,14 @@ CustomizeMode.prototype = {
wrapToolbarItem: function(aNode, aPlace) {
let wrapper = this.createWrapper(aNode, aPlace);
aNode = aNode.parentNode.replaceChild(wrapper, aNode);
// It's possible that this toolbar node is "mid-flight" and doesn't have
// a parent, in which case we skip replacing it. This can happen if a
// toolbar item has been dragged into the palette. In that case, we tell
// CustomizableUI to remove the widget from its area before putting the
// widget in the palette - so the node will have no parent.
if (aNode.parentNode) {
aNode = aNode.parentNode.replaceChild(wrapper, aNode);
}
wrapper.appendChild(aNode);
return wrapper;
},
@ -289,7 +296,9 @@ CustomizeMode.prototype = {
}
}
aWrapper.parentNode.replaceChild(toolbarItem, aWrapper);
if (aWrapper.parentNode) {
aWrapper.parentNode.replaceChild(toolbarItem, aWrapper);
}
return toolbarItem;
},
@ -409,7 +418,13 @@ CustomizeMode.prototype = {
CustomizableUI.removeWidgetFromArea(draggedItemId);
draggedWrapper = this.wrapToolbarItem(widget, "palette");
}
this.visiblePalette.insertBefore(draggedWrapper, targetNode);
// If the targetNode is the palette itself, just append
if (targetNode == this.visiblePalette) {
this.visiblePalette.appendChild(draggedWrapper);
} else {
this.visiblePalette.insertBefore(draggedWrapper, targetNode);
}
return;
}
@ -432,7 +447,6 @@ CustomizeMode.prototype = {
// then we re-wrap the widget.
let widget = this.unwrapToolbarItem(draggedWrapper);
CustomizableUI.addWidgetToArea(draggedItemId, targetArea.id, position);
LOG("Re-wrapping " + draggedItemId);
draggedWrapper = this.wrapToolbarItem(widget, "");
// If necessary, add flex to accomodate new child.