mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

backing out, per mano

This commit is contained in:
dietrich@mozilla.com 2007-06-28 11:56:37 -07:00
Родитель 724aaa4ffc
Коммит 54aa1928f8
1 изменённых файлов: 6 добавлений и 30 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
browser/components/places/content/menu.xml
Просмотреть файл

@ -87,8 +87,6 @@
readonly="true" readonly="true"
onget="return this._controller;"/> onget="return this._controller;"/>
<field name="_built">false</field>
<method name="onPopupShowing"> <method name="onPopupShowing">
<body><![CDATA[ <body><![CDATA[
if (!this._resultNode) if (!this._resultNode)
@ -96,8 +94,6 @@
if (!this._resultNode.containerOpen) if (!this._resultNode.containerOpen)
this._resultNode.containerOpen = true; this._resultNode.containerOpen = true;
if (!this._built)
this._rebuild();
if (this.popupShowingCallback) if (this.popupShowingCallback)
this.popupShowingCallback(); this.popupShowingCallback();
@ -328,7 +324,6 @@
this.appendChild(element); this.appendChild(element);
} }
} }
this._built = true;
]]></body> ]]></body>
</method> </method>
@ -349,9 +344,6 @@
}, },
itemInserted: function PMV_itemInserted(aParentNode, aNode, aIndex) { itemInserted: function PMV_itemInserted(aParentNode, aNode, aIndex) {
if (!this._self._built)
return;
if (aParentNode == this._self.getResultNode()) { if (aParentNode == this._self.getResultNode()) {
var index = this._self._startMarker + 1 + aIndex; var index = this._self._startMarker + 1 + aIndex;
var before = this._self.childNodes[index] || null; var before = this._self.childNodes[index] || null;
@ -362,9 +354,6 @@
}, },
itemRemoved: function PMV_itemRemoved(aParentNode, aNode, aIndex) { itemRemoved: function PMV_itemRemoved(aParentNode, aNode, aIndex) {
if (!this._self._built)
return;
if (aParentNode == this._self.getResultNode()) { if (aParentNode == this._self.getResultNode()) {
var children = this._self.childNodes; var children = this._self.childNodes;
@ -380,9 +369,6 @@
}, },
itemChanged: function PMV_itemChanged(aNode) { itemChanged: function PMV_itemChanged(aNode) {
if (!this._self._built)
return;
// this check can be removed once we fix bug #382397 // this check can be removed once we fix bug #382397
var parentNode = aNode.parent; var parentNode = aNode.parent;
if (!parentNode) if (!parentNode)
@ -439,9 +425,6 @@
itemReplaced: itemReplaced:
function PMV_itemReplaced(aParentNode, aOldNode, aNewNode, aIndex) { function PMV_itemReplaced(aParentNode, aOldNode, aNewNode, aIndex) {
if (!this._self._built)
return;
if (aParentNode == this._self.getResultNode()) { if (aParentNode == this._self.getResultNode()) {
var children = this._self.childNodes; var children = this._self.childNodes;
for (var i = 0; i < children.length; i++) { for (var i = 0; i < children.length; i++) {
@ -466,9 +449,6 @@
}, },
invalidateContainer: function PMV_invalidateContainer(aContainer) { invalidateContainer: function PMV_invalidateContainer(aContainer) {
if (!this._self._built)
return;
function isChildOf(node, container) { function isChildOf(node, container) {
var parent = node.parent; var parent = node.parent;
while (parent) { while (parent) {
@ -491,15 +471,15 @@
if (aContainer.containerOpen) { if (aContainer.containerOpen) {
if (viewerToRebuild) if (viewerToRebuild)
viewerToRebuild._built = false; viewerToRebuild._self._rebuild();
else else
this._self._built = false; this._self._rebuild();
} }
}, },
invalidateAll: function PMV_invalidateAll() { invalidateAll: function PMV_invalidateAll() {
this._self._containerNodesMap.splice(0); this._self._containerNodesMap.splice(0);
this._self._built = false; this._self._rebuild();
}, },
sortingChanged: function PMV_sortingChanged(aSortingMode) { sortingChanged: function PMV_sortingChanged(aSortingMode) {
@ -917,12 +897,8 @@
if (event.target != this) if (event.target != this)
return; return;
// UI performance: folder queries are cheap, keep the resultnode open // UI performance: keep the resultnode open so we don't rebuild its
// so we don't rebuild its contents whenever the popup is reopened. // contents whenever the popup is reopened.
if (!PlacesUtils.nodeIsFolder(this._resultNode)) {
this._resultNode.containerOpen = false;
this._built = false;
}
// The autoopened attribute is set for folders which have been // The autoopened attribute is set for folders which have been
// automatically opened when dragged over. Turn off this attribute // automatically opened when dragged over. Turn off this attribute