=== modified file 'chrome/content/about.xul'
--- chrome/content/about.xul 2008-02-14 19:33:22 +0000
+++ chrome/content/about.xul 2008-04-10 15:35:42 +0000
@@ -55,6 +55,7 @@
+
@@ -68,6 +69,7 @@
+
@@ -103,6 +105,7 @@
+
=== modified file 'chrome/content/flasher.js'
--- chrome/content/flasher.js 2008-02-14 19:33:22 +0000
+++ chrome/content/flasher.js 2008-04-10 15:35:42 +0000
@@ -62,7 +62,7 @@
},
doFlash: function() {
- if (this.count >= 6) {
+ if (this.count >= 12) {
this.stop();
return;
}
=== modified file 'chrome/content/mailOverlay.xul'
--- chrome/content/mailOverlay.xul 2008-02-14 19:33:22 +0000
+++ chrome/content/mailOverlay.xul 2008-04-10 15:35:42 +0000
@@ -55,7 +55,6 @@
-
=== modified file 'chrome/content/overlay.js'
--- chrome/content/overlay.js 2008-02-14 19:33:22 +0000
+++ chrome/content/overlay.js 2008-04-10 15:35:42 +0000
@@ -67,7 +67,6 @@
// Make sure our context menu items are at the bottom
contextMenu.appendChild(document.getElementById("abp-frame-menuitem"));
- contextMenu.appendChild(document.getElementById("abp-link-menuitem"));
contextMenu.appendChild(document.getElementById("abp-object-menuitem"));
contextMenu.appendChild(document.getElementById("abp-image-menuitem"));
}
@@ -591,7 +590,6 @@
elements.enabled.setAttribute("checked", abpPrefs.enabled);
elements.frameobjects.setAttribute("checked", abpPrefs.frameobjects);
elements.slowcollapse.setAttribute("checked", !abpPrefs.fastcollapse);
- elements.linkcheck.setAttribute("checked", abpPrefs.linkcheck);
elements.showintoolbar.setAttribute("checked", abpPrefs.showintoolbar);
elements.showinstatusbar.setAttribute("checked", abpPrefs.showinstatusbar);
@@ -636,6 +634,7 @@
var sidebar = document.getElementById("abp-sidebar");
if (sidebar && (!abpPrefs.detachsidebar || !sidebar.hidden)) {
document.getElementById("abp-sidebar-splitter").hidden = !sidebar.hidden;
+ document.getElementById("abp-sidebar-browser").setAttribute("src", sidebar.hidden ? "chrome://adblockplus/content/sidebar.xul" : "about:blank");
sidebar.hidden = !sidebar.hidden;
}
else
@@ -768,7 +767,6 @@
var target = document.popupNode;
var nodeType = null;
- contextMenu.abpLinkData = null;
contextMenu.abpBgData = null;
contextMenu.abpFrameData = null;
if (abp && target) {
@@ -793,26 +791,6 @@
if (contextMenu.abpFrameData && contextMenu.abpFrameData.filter)
contextMenu.abpFrameData = null;
- if (abpPrefs.linkcheck && targetNode instanceof Components.interfaces.nsIImageLoadingContent) {
- // Look for a parent link
- var linkNode = target;
- while (linkNode && !contextMenu.abpLinkData) {
- if ("href" in linkNode) {
- var link = abp.unwrapURL(linkNode.href);
- if (link) {
- contextMenu.abpLinkData = wndData.getLocation(abp.policy.type.LINK, link);
- if (contextMenu.abpLinkData && contextMenu.abpLinkData.filter)
- contextMenu.abpLinkData = null;
- }
- }
-
- linkNode = linkNode.parentNode;
- }
-
- if (linkNode)
- contextMenu.abpLink = abp.unwrapURL(linkNode.href);
- }
-
if (nodeType != "IMAGE") {
// Look for a background image
var imageNode = target;
@@ -845,7 +823,6 @@
document.getElementById("abp-image-menuitem").hidden = (nodeType != "IMAGE" && contextMenu.abpBgData == null);
document.getElementById("abp-object-menuitem").hidden = (nodeType != "OBJECT");
- document.getElementById("abp-link-menuitem").hidden = (contextMenu.abpLinkData == null);
document.getElementById("abp-frame-menuitem").hidden = (contextMenu.abpFrameData == null);
}
=== modified file 'chrome/content/overlay.xul'
--- chrome/content/overlay.xul 2008-02-14 19:33:22 +0000
+++ chrome/content/overlay.xul 2008-04-10 15:35:42 +0000
@@ -72,7 +72,6 @@
=== modified file 'chrome/content/overlayGeneral.xul'
--- chrome/content/overlayGeneral.xul 2008-02-14 19:33:22 +0000
+++ chrome/content/overlayGeneral.xul 2008-04-10 15:35:42 +0000
@@ -58,7 +58,6 @@