Mercurial Repositories > eric / file diff

--- a/APIs/Python3/eric6.api	Thu Dec 14 19:25:34 2017 +0100
+++ b/APIs/Python3/eric6.api	Mon Dec 18 18:09:39 2017 +0100
@@ -10540,10 +10540,12 @@
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.addSubscription?4(subscription)
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.addSubscriptionFromUrl?4(url)
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.block?4(info)
+eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.canRunOnScheme?4(scheme)
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.close?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.customRules?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.elementHidingRules?4(url)
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.elementHidingRulesForDomain?4(url)
+eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.enabledChanged?7
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.exceptions?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.getDefaultSubscriptionUrl?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.getRequiresSubscriptions?4(subscription)
@@ -10567,9 +10569,23 @@
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.updateAllSubscriptions?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager.useLimitedEasyList?4()
 eric6.WebBrowser.AdBlock.AdBlockManager.AdBlockManager?1(parent=None)
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.adBlockDisabledForUrl?4(url)
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.clear?4()
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.elemHideDisabledForUrl?4(url)
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.elementHidingRules?4()
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.elementHidingRulesForDomain?4(domain)
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.match?4(request, urlDomain, urlString)
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher.update?4()
+eric6.WebBrowser.AdBlock.AdBlockMatcher.AdBlockMatcher?1(manager)
 eric6.WebBrowser.AdBlock.AdBlockPage.AdBlockPage.hideBlockedPageEntries?4(page)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.addBlockedDomains?4(domains)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.allowedDomains?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.blockedDomains?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.caseSensitivity?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.copyFrom?4(other)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.cssSelector?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.filter?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.getRegExpAndMatchers?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.isCSSRule?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.isComment?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.isDocument?4()
@@ -10581,42 +10597,76 @@
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.isInternalDisabled?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.isSlow?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchDomain?4(domain)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchFont?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchImage?4(req)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchMedia?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchObject?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchObjectSubrequest?4(req)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchOther?4(req)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchPing?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchScript?4(req)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchString?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchStyleSheet?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchSubdocument?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchThirdParty?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.matchXmlHttpRequest?4(req)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.networkMatch?4(request, domain, encodedUrl)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.ruleExceptions?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.ruleOptions?4()
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.ruleType?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setEnabled?4(enabled)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setException?4(exception)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setFilter?4(filterRule)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setOption?4(opt)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.setSubscription?4(subscription)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.subscription?4()
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule.urlMatch?4(url)
 eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRule?1(filterRule="", subscription=None)
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.DocumentOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.DomainRestrictedOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ElementHideOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.FontOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ImageOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.MediaOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.NoOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ObjectOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ObjectSubrequestOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.OtherOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.PingOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ScriptOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.StyleSheetOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.SubdocumentOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.ThirdPartyOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleOption.XMLHttpRequestOption?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.CssRule?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.DomainMatchRule?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.Invalid?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.MatchAllUrlsRule?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.RegExpMatchRule?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.StringContainsMatchRule?7
+eric6.WebBrowser.AdBlock.AdBlockRule.AdBlockRuleType.StringEndsMatchRule?7
 eric6.WebBrowser.AdBlock.AdBlockRule.toSecondLevelDomain?4(url)
-eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.adBlockDisabledForUrl?4(url)
+eric6.WebBrowser.AdBlock.AdBlockSearchTree.AdBlockSearchTree.add?4(rule)
+eric6.WebBrowser.AdBlock.AdBlockSearchTree.AdBlockSearchTree.clear?4()
+eric6.WebBrowser.AdBlock.AdBlockSearchTree.AdBlockSearchTree.find?4(request, domain, urlString)
+eric6.WebBrowser.AdBlock.AdBlockSearchTree.AdBlockSearchTree?1()
+eric6.WebBrowser.AdBlock.AdBlockSearchTree.AdBlockSearchTreeNode?1()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.addRule?4(rule)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.allRules?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.canBeRemoved?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.canEditRules?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.changed?7
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.checkForUpdate?4()
-eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.elemHideDisabledForUrl?4(url)
-eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.elementHidingRules?4()
-eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.elementHidingRulesForDomain?4(domain)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.enabledChanged?7
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.isEnabled?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.lastUpdate?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.location?4()
-eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.match?4(req, urlDomain, urlString)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.removeRule?4(offset)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.replaceRule?4(rule, offset)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.requiresLocation?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.rule?4(offset)
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.rulesChanged?7
+eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.rulesEnabledChanged?7
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.rulesFileName?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.saveRules?4()
 eric6.WebBrowser.AdBlock.AdBlockSubscription.AdBlockSubscription.setEnabled?4(enabled)