Bug 741066. (Av1) browserPlacesViews.js: Fix 2 "function ... does not always return a value". r=mak77.
authorSerge Gautherie <sgautherie.bz@free.fr>
Tue, 03 Apr 2012 15:43:25 +0200
changeset 94207 5128e92c536c17aede8e950dcf1f1974324c9c1e
parent 94206 f9c4e201653935d4afdfbcb680ef75ae20eb35ec
child 94208 3801f97de34740f224e8e2590acc55e1850db330
child 94286 dd43f89c753e15a3c21b1005a0b0bf14955172fe
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmak77
bugs741066
milestone14.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 741066. (Av1) browserPlacesViews.js: Fix 2 "function ... does not always return a value". r=mak77.
browser/components/places/content/browserPlacesViews.js
--- a/browser/components/places/content/browserPlacesViews.js
+++ b/browser/components/places/content/browserPlacesViews.js
@@ -49,17 +49,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;
@@ -1673,17 +1673,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;
     let placesNode = popup._placesNode;
     // Avoid handling popuphidden of inner views
     if (placesNode && PlacesUIUtils.getViewForNode(popup) == this) {
       // UI performance: folder queries are cheap, keep the resultnode open