From e8730f68798f173bd4d1c2f9b7ce02985e3fd771 Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Fri, 1 Sep 2017 16:35:50 -0400 Subject: SpyBlock updated to 2.9.1 --- .../spyblock@gnu.org/chrome/content/ui/utils.js | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js') diff --git a/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js b/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js index 171fd60..5f8d515 100644 --- a/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js +++ b/data/extensions/spyblock@gnu.org/chrome/content/ui/utils.js @@ -1,6 +1,6 @@ /* * This file is part of Adblock Plus , - * Copyright (C) 2006-2015 Eyeo GmbH + * Copyright (C) 2006-2017 eyeo GmbH * * Adblock Plus is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 3 as @@ -35,10 +35,11 @@ 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, ElemHideEmulationFilter} = require("filterClasses"); var {FilterNotifier} = require("filterNotifier"); -var {FilterStorage, PrivateBrowsing} = require("filterStorage"); -var {IO} = require("io"); +var {FilterStorage} = require("filterStorage"); +var {IO} = require("legacyIO"); var {defaultMatcher, Matcher, CombinedMatcher} = require("matcher"); var {Prefs} = require("prefs"); var {RequestNotifier} = require("requestNotifier"); @@ -56,6 +57,25 @@ function E(id) return document.getElementById(id); } +/** + * Determines subscription's title as it should be displayed in the UI. + * @return {String} + * subscription's title or an appropriate default title if none present + */ +function getSubscriptionTitle(/**Subscription*/ subscription) +{ + if (subscription.title) + return subscription.title; + + if (subscription instanceof DownloadableSubscription) + return subscription.url; + + if (subscription instanceof SpecialSubscription && subscription.defaults) + return Utils.getString(subscription.defaults + "Group_title"); + + return Utils.getString("newGroup_title"); +} + /** * Split up all labels into the label and access key portions. */ -- cgit v1.2.3