Bug 546857 Part 4b: Fix some errors in previous patch to not use XUL …

…on error pages. r=dao a=blocker
Brli · Aug 21, 2010 · fb01c7f · fb01c7f
1 parent bf04a86
commit fb01c7f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -2604,11 +2604,6 @@ function BrowserOnClick(event) {
         );
       }
     }
-    else if (/^about:privatebrowsing/.test(errorDoc.documentURI)) {
-      if (ot == errorDoc.getElementById("startPrivateBrowsing")) {
-        gPrivateBrowsingUI.toggleMode();
-      }
-    }
 }
 
 /**

diff --git a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -114,6 +114,10 @@
         if (moreInfoLink)
           moreInfoLink.setAttribute("href", moreInfoURL + "private-browsing");
       }, false);
+
+      function togglePrivateBrowsing() {
+        mainWindow.gPrivateBrowsingUI.toggleMode();
+      }
     ]]></script>
   </head>
 
@@ -145,9 +149,10 @@
 
         <!-- Start Private Browsing -->
         <div id="startPrivateBrowsingDesc" class="showNormal">
-          <button id="startPrivateBrowsing"
+          <button xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+                  id="startPrivateBrowsing" label="&privatebrowsingpage.startPrivateBrowsing.label;"
                   accesskey="&privatebrowsingpage.startPrivateBrowsing.accesskey;"
-                  >&privatebrowsingpage.startPrivateBrowsing.label;</button>
+                  oncommand="togglePrivateBrowsing();"/>
         </div>
 
         <!-- Footer -->

diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -170,12 +170,12 @@ be temporary, and you can try again later.</li>
 <!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
 <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
 
-<!-- LOCALIZATION NOTE (securityOverride.warningText) - Do not translate the
-contents of the <xul:button> tags.  The only language content is the label= field,
-which uses strings already defined above. The button is included here (instead of
-netError.xhtml) because it exposes functionality specific to firefox. -->
+<!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
+contents of the <button> tags. It uses strings already defined above. The
+button is included here (instead of netError.xhtml) because it exposes
+functionality specific to firefox. -->
 
-<!ENTITY securityOverride.warningText "
+<!ENTITY securityOverride.warningContent "
 <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 
 <button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>

diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml
@@ -369,7 +369,7 @@
              error types.  -->
         <div id="securityOverrideDiv">
           <a id="securityOverrideLink" href="javascript:showSecuritySection();" >&securityOverride.linkText;</a>
-          <div id="securityOverrideContent" style="display: none;">&securityOverride.warningText;</div>
+          <div id="securityOverrideContent" style="display: none;">&securityOverride.warningContent;</div>
         </div>
       </div>
 

diff --git a/dom/locales/en-US/chrome/netErrorApp.dtd b/dom/locales/en-US/chrome/netErrorApp.dtd
@@ -3,7 +3,7 @@
      should go into netError.dtd -->
 
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
-<!ENTITY securityOverride.warningText "
+<!ENTITY securityOverride.warningContent "
 <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 <p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
 ">
-Original file line number
+Diff line change
@@ Expand Up / @@ -2604,11 +2604,6 @@ function BrowserOnClick(event) { @@
             );
           }
         }
-        else if (/^about:privatebrowsing/.test(errorDoc.documentURI)) {
-          if (ot == errorDoc.getElementById("startPrivateBrowsing")) {
-            gPrivateBrowsingUI.toggleMode();
-          }
-        }
     }
     /**
@@ Expand Down @@