[Pkg-mozext-commits] [adblock-plus] 67/87: Issue 3955 - Set required ABP version properly when exporting filter lists with CSS property filters
David Prévot
taffit at moszumanska.debian.org
Sat Apr 30 17:59:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit 758a4e45af5de70073b32865d0f342c961629c29
Author: Wladimir Palant <trev at adblockplus.org>
Date: Tue Apr 19 14:36:33 2016 +0200
Issue 3955 - Set required ABP version properly when exporting filter lists with CSS property filters
---
chrome/content/ui/filters-backup.js | 5 ++++-
chrome/content/ui/utils.js | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/chrome/content/ui/filters-backup.js b/chrome/content/ui/filters-backup.js
index 95d208d..a5e74db 100644
--- a/chrome/content/ui/filters-backup.js
+++ b/chrome/content/ui/filters-backup.js
@@ -315,7 +315,10 @@ var Backup =
minVersion = "2.1";
if (filter instanceof RegExpFilter && filter.contentType & (RegExpFilter.typeMap.GENERICHIDE | RegExpFilter.typeMap.GENERICBLOCK) && Services.vc.compare(minVersion, "2.6.12") < 0)
- minVersion = "2.6.12";
+ minVersion = "2.6.12";
+
+ if (filter instanceof CSSPropertyFilter && Services.vc.compare(minVersion, "2.7.3") < 0)
+ minVersion = "2.7.3";
}
}
list.unshift("[Adblock Plus " + minVersion + "]");
diff --git a/chrome/content/ui/utils.js b/chrome/content/ui/utils.js
index f367d75..bff3969 100644
--- a/chrome/content/ui/utils.js
+++ b/chrome/content/ui/utils.js
@@ -35,7 +35,8 @@ function require(/**String*/ module)
var {Policy} = require("contentPolicy");
var {Filter, InvalidFilter, CommentFilter, ActiveFilter, RegExpFilter,
- BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter, ElemHideException} = require("filterClasses");
+ BlockingFilter, WhitelistFilter, ElemHideBase, ElemHideFilter,
+ ElemHideException, CSSPropertyFilter} = require("filterClasses");
var {FilterNotifier} = require("filterNotifier");
var {FilterStorage} = require("filterStorage");
var {IO} = require("io");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list