Bug 1259574 - Set disableglobalhistory on Loop / PanelFrame browsers. r?Standard8 draft
authorMike Conley <mconley@mozilla.com>
Thu, 24 Mar 2016 17:42:23 -0400
changeset 344579 40f2365a5312fad7ae8a5498565fdeae0eb41dc6
parent 344578 d43bf084093fe16e6c0bf33f4d1f02ad7532e29e
child 344580 86cc6e13ffa41d1fa80bbce720e899a915ad4dc4
push id13864
push usermconley@mozilla.com
push dateThu, 24 Mar 2016 21:51:31 +0000
reviewersStandard8
bugs1259574
milestone48.0a1
Bug 1259574 - Set disableglobalhistory on Loop / PanelFrame browsers. r?Standard8 MozReview-Commit-ID: 2wkOlOjH6NB
browser/extensions/loop/chrome/content/modules/MozLoopService.jsm
browser/modules/PanelFrame.jsm
--- a/browser/extensions/loop/chrome/content/modules/MozLoopService.jsm
+++ b/browser/extensions/loop/chrome/content/modules/MozLoopService.jsm
@@ -1970,16 +1970,17 @@ this.MozLoopService = {
     let appContent = xulDoc.getElementById("appcontent");
     let tabBrowser = xulDoc.getElementById("content");
     appContent.insertBefore(box, tabBrowser);
 
     var xulBrowser = xulDoc.createElementNS(kNSXUL, "browser");
     xulBrowser.setAttribute("id", "loop-slideshow-browser");
     xulBrowser.setAttribute("flex", "1");
     xulBrowser.setAttribute("type", "content");
+    xulBrowser.setAttribute("disableglobalhistory", "true");
     box.appendChild(xulBrowser);
 
     // Notify the UI, which has the side effect of disabling panel opening
     // and updating the toolbar icon to visually indicate difference.
     xulWin.LoopUI.isSlideshowOpen = true;
 
     var removeSlideshow = function() {
       try {
--- a/browser/modules/PanelFrame.jsm
+++ b/browser/modules/PanelFrame.jsm
@@ -70,17 +70,18 @@ var PanelFrameInternal = {
         "flex": "1",
 
         // work around bug 793057 - by making the panel roughly the final size
         // we are more likely to have the anchor in the correct position.
         "style": "width: " + width + "px; height: " + height + "px;",
         "dynamicresizer": !aSize,
 
         "origin": aOrigin,
-        "src": aSrc
+        "src": aSrc,
+        "disableglobalhistory": "true",
       };
       if (aType == "social") {
         attrs["message"] = "true";
         attrs["messagemanagergroup"] = aType;
       }
       if (aType == "loop") {
         attrs.message = true;
         attrs.messagemanagergroup = "social";