Bug 407443 - menus for query based folders (smart bookmarks, saved searches) not refreshed after deleting an item (for mak77@supereva.it, r=dietrich, a=schrep)

2008-05-06 12:21:10 -07:00 · 2008-05-06 12:21:10 -07:00 · 88073540a8
--- a/browser/components/places/content/menu.xml
+++ b/browser/components/places/content/menu.xml
@ -819,10 +819,13 @@
            }
          }

-          if (popupToRebuild)
-            popupToRebuild._built = false;
-          else
-            this._self._built = false;
+          if (!popupToRebuild)
+            popupToRebuild = this._self;
+          popupToRebuild._built = false;
+
+          // if the menupopup is open we should live-update it
+          if (popupToRebuild.parentNode.open)
+            this._self._rebuild(popupToRebuild);
        },

        invalidateAll: function PMV_invalidateAll() {
--- a/browser/components/places/content/toolbar.xml
+++ b/browser/components/places/content/toolbar.xml
@ -654,8 +654,13 @@
            }
          }

-          if (popupToRebuild)
+          if (popupToRebuild) {
            popupToRebuild._built = false;
+
+            // if the menupopup is open we should live-update it
+            if (popupToRebuild.parentNode.open)
+              this._self._rebuildPopup(popupToRebuild);
+          }
        },

        invalidateAll: function TV_V_invalidateAll() {
@ -1025,9 +1030,14 @@
      <method name="_containerPopupShowing">
        <parameter name="aPopup"/>
        <body><![CDATA[
-          if (aPopup._built)
-            return;
+          if (!aPopup._built)
+            this._rebuildPopup(aPopup);
+        ]]></body>
+      </method>

+      <method name="_rebuildPopup">
+        <parameter name="aPopup"/>
+        <body><![CDATA[
          PlacesUIUtils.cleanPlacesPopup(aPopup);

          var resultNode = aPopup._resultNode;