Bug 741062. (Cv1) Port |Bug 741066 - browserPlacesViews.js: 2 "function ... does not always return a value"| to SeaMonkey. r=Neil a=Callek
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 03 Apr 2012 09:02:00 -0400
changeset 10723 5389cca69224ebf6d737937bd5afcb39eaf81ac3
parent 10722 420f5c9314c699d4999c4348b27cdc0d3343581d
child 10724 653d3b0d33ae95dbd6f062b19d87db8a93882ce5
push idunknown
push userunknown
push dateunknown
reviewersNeil, Callek
bugs741062, 741066
Bug 741062. (Cv1) Port |Bug 741066 - browserPlacesViews.js: 2 "function ... does not always return a value"| to SeaMonkey. r=Neil a=Callek
suite/common/places/browserPlacesViews.js
--- a/suite/common/places/browserPlacesViews.js
+++ b/suite/common/places/browserPlacesViews.js
@@ -86,17 +86,17 @@ PlacesViewBase.prototype = {
     result.addObserver(this, false);
     return val;
   },
 
   _result: null,
   get result() this._result,
   set result(val) {
     if (this._result == val)
-      return;
+      return val;
 
     if (this._result) {
       this._result.removeObserver(this);
       this._resultNode.containerOpen = false;
     }
 
     if (this._rootElt.localName == "menupopup")
       this._rootElt._built = false;
@@ -1578,17 +1578,17 @@ PlacesToolbar.prototype = {
       aEvent.preventDefault();
       return;
     }
 
     let parent = aEvent.target.parentNode;
     if (parent.localName == "toolbarbutton")
       this._openedMenuButton = parent;
 
-    return PlacesViewBase.prototype._onPopupShowing.apply(this, arguments);
+    PlacesViewBase.prototype._onPopupShowing.apply(this, arguments);
   },
 
   _onPopupHidden: function PT__onPopupHidden(aEvent) {
     let popup = aEvent.target;
 
     // Avoid handling popuphidden of inner views
     if (popup._placesNode && PlacesUIUtils.getViewForNode(popup) == this) {
       // UI performance: folder queries are cheap, keep the resultnode open