From 2f9a73b76aedccd0e54b42870264d224e365ce0e Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 28 Apr 2015 13:43:25 -0700 Subject: [PATCH 1/5] Add Fastly exclusion for Boing Boing web fonts. --- src/chrome/content/rules/Fastly.net.xml | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/rules/Fastly.net.xml b/src/chrome/content/rules/Fastly.net.xml index 8c0f89137484..0ec31796d8cd 100644 --- a/src/chrome/content/rules/Fastly.net.xml +++ b/src/chrome/content/rules/Fastly.net.xml @@ -1,7 +1,6 @@ + + + From c2bb10d9be9603a9cfab9ede2cdd630beca8c8e0 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 28 Apr 2015 13:44:06 -0700 Subject: [PATCH 2/5] Disable next.co.uk. --- src/chrome/content/rules/Next.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Next.xml b/src/chrome/content/rules/Next.xml index 959c1a3a734c..b9bde5a03bbf 100644 --- a/src/chrome/content/rules/Next.xml +++ b/src/chrome/content/rules/Next.xml @@ -1,4 +1,7 @@ - + + From fdd3548dc73b2544a895e86163c5ba7ebb3fe8b0 Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 28 Apr 2015 13:44:20 -0700 Subject: [PATCH 3/5] Exclude europe.mozilla.org. --- src/chrome/content/rules/Mozilla.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/chrome/content/rules/Mozilla.xml b/src/chrome/content/rules/Mozilla.xml index 666d3b834bbd..7e3ada470b35 100644 --- a/src/chrome/content/rules/Mozilla.xml +++ b/src/chrome/content/rules/Mozilla.xml @@ -226,7 +226,7 @@ https://mail1.eff.org/pipermail/https-everywhere-rules/2013-June/001635.html --> - + @@ -252,6 +252,7 @@ + From 1adf2efa03bcadd4e7f07edd261e34b69276291c Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 28 Apr 2015 13:44:27 -0700 Subject: [PATCH 4/5] Avoid "_getTabForContentWindow is not a function" --- src/components/https-everywhere.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/https-everywhere.js b/src/components/https-everywhere.js index 33eec3a3ecd3..81f6ad6703c2 100644 --- a/src/components/https-everywhere.js +++ b/src/components/https-everywhere.js @@ -361,7 +361,7 @@ HTTPSEverywhere.prototype = { .getInterface(Ci.nsIDOMWindow); // this is the gBrowser object of the firefox window this tab is in var gBrowser = aDOMWindow.gBrowser; - if (gBrowser) { + if (gBrowser && gBrowser._getTabForContentWindow) { var aTab = gBrowser._getTabForContentWindow(contentWindow.top); // this is the clickable tab xul element, the one found in the tab strip // of the firefox window, aTab.linkedBrowser is same as browser var above From 7cda8a9ce041480f3935f825c8e1127917ed581f Mon Sep 17 00:00:00 2001 From: Jacob Hoffman-Andrews Date: Tue, 28 Apr 2015 14:00:51 -0700 Subject: [PATCH 5/5] Implement a more general fix for fontawesome URLs. --- src/chrome/content/rules/Fastly.net.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/rules/Fastly.net.xml b/src/chrome/content/rules/Fastly.net.xml index 0ec31796d8cd..fbbca8dc3364 100644 --- a/src/chrome/content/rules/Fastly.net.xml +++ b/src/chrome/content/rules/Fastly.net.xml @@ -34,13 +34,18 @@ - - + + +