Bug 405344 - "Clicking star should not select address bar (Inconsistent behaviour)" [p=dao@mozilla.com (D��o Gottwald) r=Mano a=blocking-firefox3+]

browser/base/content/browser-places.js

@@ -786,7 +786,11 @@ var PlacesStarButton = {
   },
 
   onClick: function PSB_onClick(aEvent) {
-    PlacesCommandHook.bookmarkCurrentPage(this._starred);
+    if (aEvent.button == 0)
+      PlacesCommandHook.bookmarkCurrentPage(this._starred);
+
+    // don't bubble to the textbox so that the address won't be selected
+    aEvent.stopPropagation();
   },
 
   // nsINavBookmarkObserver  

browser/base/content/browser.xul

@@ -302,7 +302,7 @@
                    onclick="goDoCommand('safebrowsing-show-warning')"/>
 #endif
           <image id="star-button"
-                 onclick="if (event.button == 0) PlacesStarButton.onClick(event);"/>
+                 onclick="PlacesStarButton.onClick(event);"/>
           <image id="go-button" chromedir="&locale.dir;"
                  tooltiptext="&goEndCap.tooltip;"
                  onclick="handleURLBarCommand(event);"/>