1.1 --- a/src/chrome.manifest	Thu Nov 20 18:03:50 2008 +0100
     1.2 +++ b/src/chrome.manifest	Thu Nov 20 19:42:48 2008 +0100
     1.3 @@ -4,8 +4,11 @@
     1.4  overlay   chrome://songbird/content/xul/layoutWithBrowserOverlay.xul chrome://adblockplus/content/overlay.xul
     1.5  overlay   chrome://midbrowser/content/midbrowser.xul chrome://adblockplus/content/overlay.xul
     1.6  overlay   chrome://emusic/content/startup.xul chrome://adblockplus/content/overlay.xul
     1.7 +overlay   chrome://webrunner/content/webrunner.xul chrome://adblockplus/content/prismOverlay.xul
     1.8  content   adblockplus jar:chrome/adblockplus.jar!/content/
     1.9  skin      adblockplus classic/1.0 jar:chrome/adblockplus.jar!/skin/classic/
    1.10  style     chrome://global/content/customizeToolbar.xul  chrome://adblockplus/skin/overlay.css
    1.11  locale    adblockplus {{LOCALE}} jar:chrome/adblockplus.jar!/locale/{{LOCALE}}/
    1.12  
    1.13 +# Work-around for bug 465991 (to be removed once Prism 0.9 is no longer supported)
    1.14 +override  chrome://webrunner/content/overlays/inspector.xul data:text/xml,<nada/> application=prism@developer.mozilla.org appversion=0.9

     2.1 --- a/src/chrome/content/overlay.js	Thu Nov 20 18:03:50 2008 +0100
     2.2 +++ b/src/chrome/content/overlay.js	Thu Nov 20 19:42:48 2008 +0100
     2.3 @@ -59,7 +59,7 @@
     2.4    }
     2.5  
     2.6    // Install context menu handler
     2.7 -  var contextMenu = document.getElementById("contentAreaContextMenu") || document.getElementById("messagePaneContext");
     2.8 +  var contextMenu = document.getElementById("contentAreaContextMenu") || document.getElementById("messagePaneContext") || document.getElementById("popup_content");
     2.9    if (contextMenu) {
    2.10      contextMenu.addEventListener("popupshowing", abpCheckContext, false);
    2.11    
    2.12 @@ -124,10 +124,8 @@
    2.13      return getBrowser();
    2.14    else if ("messageContent" in window)
    2.15      return window.messageContent;
    2.16 -  else if (document.getElementById("frame_main_pane"))
    2.17 -    return document.getElementById("frame_main_pane");
    2.18    else
    2.19 -    return null;
    2.20 +    return document.getElementById("frame_main_pane") || document.getElementById("browser_content");
    2.21  }
    2.22  
    2.23  function abpReloadPrefs() {
    2.24 @@ -190,8 +188,8 @@
    2.25        else
    2.26          element.hidden = !abpPrefs.showintoolbar;
    2.27  
    2.28 -      // HACKHACK: Show status bar icon in SeaMonkey Mail and Songbird instead of toolbar icon
    2.29 -      if (element.hidden && (element.tagName == "statusbarpanel" || element.tagName == "vbox") && (document.getElementById("msgToolbar") || document.getElementById("frame_main_pane_html")))
    2.30 +      // HACKHACK: Show status bar icon in SeaMonkey Mail, Songbird and Prism instead of toolbar icon
    2.31 +      if (element.hidden && (element.tagName == "statusbarpanel" || element.tagName == "vbox") && (document.getElementById("msgToolbar") || document.getElementById("frame_main_pane_html") || location.host == "webrunner"))
    2.32          element.hidden = !abpPrefs.showintoolbar;
    2.33  
    2.34        if (abpOldShowInToolbar != abpPrefs.showintoolbar)
    2.35 @@ -655,7 +653,7 @@
    2.36  
    2.37  // Hides the unnecessary context menu items on display
    2.38  function abpCheckContext() {
    2.39 -  var contextMenu = document.getElementById("contentAreaContextMenu") || document.getElementById("messagePaneContext");
    2.40 +  var contextMenu = document.getElementById("contentAreaContextMenu") || document.getElementById("messagePaneContext") || document.getElementById("popup_content");
    2.41    var target = document.popupNode;
    2.42  
    2.43    var nodeType = null;

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/chrome/content/prismOverlay.xul	Thu Nov 20 19:42:48 2008 +0100
     3.3 @@ -0,0 +1,59 @@
     3.4 +<?xml version="1.0"?>
     3.5 +
     3.6 +<!-- ***** BEGIN LICENSE BLOCK *****
     3.7 +   - Version: MPL 1.1
     3.8 +   -
     3.9 +   - The contents of this file are subject to the Mozilla Public License Version
    3.10 +   - 1.1 (the "License"); you may not use this file except in compliance with
    3.11 +   - the License. You may obtain a copy of the License at
    3.12 +   - http://www.mozilla.org/MPL/
    3.13 +   -
    3.14 +   - Software distributed under the License is distributed on an "AS IS" basis,
    3.15 +   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    3.16 +   - for the specific language governing rights and limitations under the
    3.17 +   - License.
    3.18 +   -
    3.19 +   - The Original Code is Adblock Plus.
    3.20 +   -
    3.21 +   - The Initial Developer of the Original Code is
    3.22 +   - Wladimir Palant.
    3.23 +   - Portions created by the Initial Developer are Copyright (C) 2008
    3.24 +   - the Initial Developer. All Rights Reserved.
    3.25 +   -
    3.26 +   - Contributor(s):
    3.27 +   -
    3.28 +   - ***** END LICENSE BLOCK ***** -->
    3.29 +
    3.30 +<?xul-overlay href="chrome://adblockplus/content/overlayGeneral.xul"?>
    3.31 +
    3.32 +<overlay id="abp-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
    3.33 +  <!-- Window extensions -->
    3.34 +  <window id="webrunner">
    3.35 +    <popupset id="abp-popupset"/>
    3.36 +    <keyset id="abp-keyset"/>
    3.37 +    <commandset id="abp-commandset"/>
    3.38 +  </window>
    3.39 +
    3.40 +  <!-- Status bar -->
    3.41 +  <statusbar id="statusbar">
    3.42 +    <statusbarpanel id="abp-status" mousethrough="never" insertbefore="button_commands"/>
    3.43 +  </statusbar>
    3.44 +
    3.45 +  <!-- Tools menu -->
    3.46 +  <menupopup id="popup_tools">
    3.47 +    <menuitem id="abp-menuitem" insertbefore="menuitem_console"/>
    3.48 +  </menupopup>
    3.49 +
    3.50 +  <!-- Context menu -->
    3.51 +  <menupopup id="popup_content"> 
    3.52 +    <menuitem id="abp-image-menuitem"/>
    3.53 +    <menuitem id="abp-object-menuitem"/>
    3.54 +    <menuitem id="abp-frame-menuitem"/>
    3.55 +  </menupopup>
    3.56 +
    3.57 +  <!-- Fake sidebar -->
    3.58 +  <vbox id="box_content">
    3.59 +    <splitter id="abp-sidebar-splitter"/>
    3.60 +    <vbox id="abp-sidebar"/>
    3.61 +  </vbox>
    3.62 +</overlay>

     4.1 --- a/src/install.rdf	Thu Nov 20 18:03:50 2008 +0100
     4.2 +++ b/src/install.rdf	Thu Nov 20 19:42:48 2008 +0100
     4.3 @@ -84,6 +84,15 @@
     4.4      </Description>
     4.5    </em:targetApplication>
     4.6  
     4.7 +  <!-- Prism -->
     4.8 +  <em:targetApplication>
     4.9 +    <Description>
    4.10 +      <em:id>prism@developer.mozilla.org</em:id>
    4.11 +      <em:minVersion>0.9</em:minVersion>
    4.12 +      <em:maxVersion>0.9.*</em:maxVersion>
    4.13 +    </Description>
    4.14 +  </em:targetApplication>
    4.15 +
    4.16    <!-- Front End MetaData -->
    4.17    <em:name>Adblock Plus</em:name>
    4.18    <em:description>Ads were yesterday!</em:description>