Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Removed a popup-blocker-specific menu from the collusion banner notif…

…ication
  • Loading branch information...
commit 5f2b3e975792260649c062d66789e673cc0ac884 1 parent 9ff8cd4
Jono Xia authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 lib/main.js
View
7 lib/main.js
@@ -7,6 +7,7 @@ var xhr = require("xhr");
var timers = require("timers");
var privateBrowsing = require("private-browsing");
var storage = require("simple-storage").storage;
+var windowUtils = require("window-utils");
// APIs not yet exposed through Jetpack libraries:
var {Cc, Ci, Cr} = require('chrome');
@@ -471,10 +472,10 @@ function initCollusion() {
channel.cancel(Cr.NS_ERROR_FAILURE);
// Pop a banner notification that content was blocked, with an "allow" button.
+ // TODO make these strings localizable
var message = "Collusion has blocked third-party content on this site";
var popupButtonText = "Options";
var popupButtonAccesskey = "O";
- var windowUtils = require("window-utils");
var window = windowUtils.activeBrowserWindow;
var thistab = window.gBrowser.mCurrrentBrowser;
var notificationBox = window.gBrowser.getNotificationBox(thistab);
@@ -485,12 +486,12 @@ function initCollusion() {
var buttons = [{
label: popupButtonText,
accessKey: popupButtonAccesskey,
- popup: "blockedPopupOptions",
+ popup: null,
callback: null
}];
const priority = notificationBox.PRIORITY_WARNING_MEDIUM;
- notificationBox.appendNotification(message, "popup-blocked",
+ notificationBox.appendNotification(message, "collusion-blocked",
"chrome://browser/skin/Info.png",
priority, buttons);
}
Please sign in to comment.
Something went wrong with that request. Please try again.