Bug 717111 Plain text editor context menu broken (regression from bug 702019) r=IanN

suite/common/contentAreaContextOverlay.xul

@@ -61,7 +61,7 @@
      -->
     <menupopup id="contentAreaContextMenu"
                pagemenu="start"
-               onpopupshowing="if (event.target != this) return true; gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey); return gContextMenu.shouldDisplay;"
+               onpopupshowing="if (event.target != this) return true; gContextMenu = new nsContextMenu(this, null, event.shiftKey); return gContextMenu.shouldDisplay;"
                onpopuphiding="if (event.target == this) gContextMenu = null;">
       <menuseparator id="page-menu-separator"/>
       <menuitem id="popupwindow-reject"

suite/common/nsContextMenu.js

@@ -75,7 +75,8 @@ nsContextMenu.prototype = {
       return;
 
     this.hasPageMenu = false;
-    if (!aIsShift && aXulMenu.hasAttribute("pagemenu"))
+    if (!aIsShift && this.browser.docShell.allowJavascript &&
+        Services.prefs.getBoolPref("javascript.enabled"))
       this.hasPageMenu = PageMenu.maybeBuildAndAttachMenu(this.target,
                                                           aXulMenu);