Bug 812108 - ensure that if 'try again' on a social error fails, we continue to display the error message. r=felipe
authorMark Hammond <mhammond@skippinet.com.au>
Thu, 29 Nov 2012 16:25:34 +1100
changeset 123563 7a41fb508d8923279e528c9b7f2dc88f362cb6b2
parent 123562 5948fb7390ef95c3c1b44a41a7214351558ef338
child 123564 445dc074e609870fb32bb5da2263be63e35da659
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfelipe
bugs812108
milestone20.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 812108 - ensure that if 'try again' on a social error fails, we continue to display the error message. r=felipe
browser/base/content/browser-social.js
--- a/browser/base/content/browser-social.js
+++ b/browser/base/content/browser-social.js
@@ -1084,17 +1084,19 @@ SocialErrorListener.prototype = {
 
   setErrorMessage: function(aWebProgress) {
     switch (this.type) {
       case "flyout":
         SocialFlyout.setFlyoutErrorMessage();
         break;
 
       case "sidebar":
-        SocialSidebar.setSidebarErrorMessage("sidebar-error");
+        // a frameworker error "trumps" a sidebar error.
+        let reason = Social.errorState ? Social.errorState : "sidebar-error";
+        SocialSidebar.setSidebarErrorMessage(reason);
         break;
 
       case "notification-panel":
         let frame = aWebProgress.QueryInterface(Ci.nsIDocShell)
                                 .chromeEventHandler;
         SocialToolbar.setPanelErrorMessage(frame);
         break;
     }