Skip to content

Commit

Permalink
Fixed some bugs
Browse files Browse the repository at this point in the history 
Fixed abp:subscripe links
Removed Send complaint link from blank pages
  • Loading branch information
@ameshkov
ameshkov committed Jul 1, 2015
1 parent e9b04a2 commit 15c5278
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 66 deletions.
2 changes: 0 additions & 2 deletions Extension/browser/firefox/lib/contextMenu.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ var ContextMenu = exports.ContextMenu = {
} else if (tabInfo.urlFilteringDisabled) {
this.menu.addItem(this._createItem('context_site_filtering_disabled'));
this.menu.addItem(this._createSeparator());
this.menu.addItem(this._createItem('context_abuse_site'));
this.menu.addItem(this._createSeparator());
this._createSettingsMenu();
this.menu.addItem(this._createItem('context_update_antibanner_filters'));
} else {
Expand Down
12 changes: 7 additions & 5 deletions Extension/filters/filter_1.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
! Version: 1.0.25.17
! Version: 1.0.25.18
! Name: Russian filter
! Description: Filter that enables removing of the ads from websites in Russian.
! NameEn: Russian filter
! DescriptionEn: Filter that enables blocking of ads on websites in Russian.
! TimeUpdated: 2015-06-30T19:24:26.671+03:00
! TimeUpdated: 2015-07-01T16:27:52.982+03:00
! Adguard Russian Filter
!
! Filter that enables removing of the ads from websites with Russian content.
Expand Down Expand Up @@ -8551,6 +8551,7 @@ letitbit.net#%#window.open = function() {};
kinokopilka.tv#%#window.open = function() {};
! Мимикрируем под adfox, иначе страница вечно грузится (livejournal, sports.ru)
~ntv.ru,~rg.ru#%#var AdFox_getCodeScript = function() {};
!
! Удаление iframe от баннера, иначе страница вечно грузится
newsland.com,newsland.ru,glav.su,eg.ru,kp.ru,kg-portal.ru,sovsport.md,newsland.com,newsland.ru,glav.su,eg.ru,kp.ru,kg-portal.ru,select.by,sovsport.md,sovsport.ru,playground.ru,kinonews.ru,gismeteo.ua,gismeteo.by,soccer.ru,mobile-review.com,ria.ru,thg.ru,mk.ru#%#AG_onLoad(function() { window.AG_removeElementBySelector('iframe[id^="ar_"]'); });
irr.ru#%#AG_onLoad(function() { window.AG_removeElementBySelector('iframe[id^="bw_"]'); });
Expand Down Expand Up @@ -8597,6 +8598,8 @@ valetudo.ru#%#window.open = function() {};
play.aniland.org#%#document.cookie = "rec=2001";
! http://forum.adguard.com/showthread.php?5821
metrprice.ru#%#AG_onLoad(function() { $('div.special-offers').closest('.h-layout__item').remove(); });
! strana.in.ua - кликандер
strana.in.ua#%#AG_onLoad(function() { window.GetCookie = function() { return 'haha'; }; });
!-------------------
!-------CSS---------
!-------------------
Expand Down Expand Up @@ -12025,7 +12028,6 @@ my-svadba.ru##.look-at-me
playground.ru###foundationWrapper div[style="width: 960px; margin: 0 auto;"] > a[href^="http://www.playground.ru/redirect/"]
radikal.ru,radikal.cc,f-picture.net,radical-foto.ru##div[style^="height: 340px; width: 640px;"]
rutracker.org##iframe[src*="/195.82.146.52/"]
mail.yandex.ua##.b-folders__nesting
meta.ua###matv
||interfax.ru/ftproot/textphotos/2015/06/25/160prv.jpg
uznayvse.ru##.soctabs
Expand Down Expand Up @@ -16869,11 +16871,9 @@ zastava.net.ua#@#.banners
@@||www.s7.ru$document
! для того чтобы работали ссылки на форуме 4pda.ru
@@.gameleads.ru^$domain=4pda.ru
@@.mts.ru/$document
@@||anrdoezrs.net^$domain=4pda.ru
@@||apmebf.com^$domain=4pda.ru
@@||cityads.ru^$domain=4pda.ru
@@||po.ua/media/
! игры odnoklassniki
@@.ngs.ru/advert/
@@||atm-karta.ru/index.php$document
Expand Down Expand Up @@ -16948,6 +16948,8 @@ zastava.net.ua#@#.banners
! ----------------------------------------------
! ----------------------------------------------
! ----------------------------------------------
@@.mts.ru/$document
@@||po.ua/media/
@@||ads.adfox.ru/*/goLink$domain=slon.ru
@@||ads.chatovod.ru^$domain=chat.muz-tv.ru|chatovod.ru|spiritix.eu|детскийчат.рф|подростковыйчат.рф|чатволчат.рф|чаткроватка.рф|чатобщения.рф
@@||adriver.ru$domain=tsn.ua
Expand Down
66 changes: 45 additions & 21 deletions Extension/filters/filter_2.txt
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions Extension/filters/filter_4.txt
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
! Version: 1.0.5.87
! Version: 1.0.5.88
! Name: Social media filter
! Description: A filter for social media widgets ("Like" buttons and such).
! NameEn: Social media filter
! DescriptionEn: Filter for social media widgets ("Like" buttons and such).
! TimeUpdated: 2015-06-30T18:16:53.246+03:00
! TimeUpdated: 2015-07-01T16:28:21.785+03:00
! Adguard Social Media Filter
!
! If you do not like numerous «Like» and «Tweet» buttons on all the popular websites on the Internet,
Expand Down Expand Up @@ -230,6 +230,10 @@ softwares-serials.in#$##FTslide { visibility: hidden;!important; }
!
! Contains rules for specific web sites
!
strana.in.ua###overlay
strana.in.ua##.popup
ifootball.pro###overlay
ifootball.pro##.popup
gamespot.com##.share-dropdown
sovsport.ru##.social-list
rg.ru##.social_bottom
Expand Down
68 changes: 34 additions & 34 deletions Extension/filters/filters.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
<name><![CDATA[Russian filter]]></name>
<description><![CDATA[Filter that enables removing of the ads from websites in Russian.]]></description>
<homepage><![CDATA[http://adguard.com/filters.html#russian]]></homepage>
<version><![CDATA[1.0.25.17]]></version>
<version><![CDATA[1.0.25.18]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-06-30T20:24:26.671+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T17:27:52.982+04:00]]></timeUpdated>
<displayNumber><![CDATA[6]]></displayNumber>
<subscriptionUrl><![CDATA[http://adguard.com/ru/filter-rules.html?id=1]]></subscriptionUrl>
<languages>
Expand Down Expand Up @@ -60,9 +60,9 @@
<name><![CDATA[English filter]]></name>
<description><![CDATA[Filter that enables removing of the ads from websites with English content.]]></description>
<homepage><![CDATA[http://adguard.com/filters.html#english]]></homepage>
<version><![CDATA[1.0.62.13]]></version>
<version><![CDATA[1.0.62.16]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T16:00:43.395+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:06:56.112+04:00]]></timeUpdated>
<displayNumber><![CDATA[1]]></displayNumber>
<subscriptionUrl><![CDATA[http://adguard.com/ru/filter-rules.html?id=2]]></subscriptionUrl>
<languages>
Expand Down Expand Up @@ -162,9 +162,9 @@
<name><![CDATA[Social media filter]]></name>
<description><![CDATA[A filter for social media widgets ("Like" buttons and such).]]></description>
<homepage><![CDATA[http://adguard.com/filters.html#social]]></homepage>
<version><![CDATA[1.0.5.87]]></version>
<version><![CDATA[1.0.5.88]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-06-30T19:16:53.246+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T17:28:21.785+04:00]]></timeUpdated>
<displayNumber><![CDATA[3]]></displayNumber>
<subscriptionUrl><![CDATA[http://adguard.com/ru/filter-rules.html?id=4]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -571,9 +571,9 @@
<name><![CDATA[EasyList]]></name>
<description><![CDATA[EasyList is the primary subscription that removes adverts from English webpages.]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.19]]></version>
<version><![CDATA[1.0.39.20]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:00:36.819+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:00:55.010+04:00]]></timeUpdated>
<displayNumber><![CDATA[101]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylist.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -617,9 +617,9 @@
<name><![CDATA[EasyList China]]></name>
<description><![CDATA[中文 supplement for EasyList]]></description>
<homepage><![CDATA[http://abpchina.org/forum/]]></homepage>
<version><![CDATA[1.0.39.38]]></version>
<version><![CDATA[1.0.39.39]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:01:09.838+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:01:29.880+04:00]]></timeUpdated>
<displayNumber><![CDATA[104]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistchina.txt]]></subscriptionUrl>
<languages>
Expand Down Expand Up @@ -650,9 +650,9 @@
<name><![CDATA[EasyList Dutch]]></name>
<description><![CDATA[Nederlands supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.33]]></version>
<version><![CDATA[1.0.39.34]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:01:25.519+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:01:45.525+04:00]]></timeUpdated>
<displayNumber><![CDATA[106]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistdutch.txt]]></subscriptionUrl>
<languages/>
Expand All @@ -664,9 +664,9 @@
<name><![CDATA[EasyList Germany]]></name>
<description><![CDATA[Deutsch supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.46]]></version>
<version><![CDATA[1.0.39.47]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:01:34.136+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:01:54.444+04:00]]></timeUpdated>
<displayNumber><![CDATA[107]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistgermany.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -694,9 +694,9 @@
<name><![CDATA[EasyList Italy]]></name>
<description><![CDATA[italiano supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.10]]></version>
<version><![CDATA[1.0.39.11]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:01:48.897+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:02:15.163+04:00]]></timeUpdated>
<displayNumber><![CDATA[109]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easylistitaly.txt]]></subscriptionUrl>
<languages>
Expand Down Expand Up @@ -758,9 +758,9 @@
<name><![CDATA[Liste FR]]></name>
<description><![CDATA[français supplement for EasyList]]></description>
<homepage><![CDATA[http://adblock-listefr.com/]]></homepage>
<version><![CDATA[1.0.39.25]]></version>
<version><![CDATA[1.0.39.26]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:02:18.683+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:02:44.596+04:00]]></timeUpdated>
<displayNumber><![CDATA[113]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/liste_fr.txt]]></subscriptionUrl>
<languages>
Expand Down Expand Up @@ -790,9 +790,9 @@
<name><![CDATA[RU AdList]]></name>
<description><![CDATA[русский, українська supplement for EasyList]]></description>
<homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
<version><![CDATA[1.0.39.19]]></version>
<version><![CDATA[1.0.39.20]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:02:33.601+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:03:04.512+04:00]]></timeUpdated>
<displayNumber><![CDATA[115]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/advblock.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -836,9 +836,9 @@
<name><![CDATA[EasyPrivacy]]></name>
<description><![CDATA[privacy protection supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.6]]></version>
<version><![CDATA[1.0.39.7]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:02:56.032+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:03:27.751+04:00]]></timeUpdated>
<displayNumber><![CDATA[118]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/easyprivacy.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -898,9 +898,9 @@
<name><![CDATA[Fanboy's Annoyances]]></name>
<description><![CDATA[removes online annoyances (includes Fanboy's Social Blocking List) supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.29]]></version>
<version><![CDATA[1.0.39.30]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:03:24.269+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:03:58.034+04:00]]></timeUpdated>
<displayNumber><![CDATA[122]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/fanboy-annoyance.txt]]></subscriptionUrl>
<languages/>
Expand All @@ -912,9 +912,9 @@
<name><![CDATA[Fanboy's Social Blocking List]]></name>
<description><![CDATA[removes social media integration supplement for EasyList]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.17]]></version>
<version><![CDATA[1.0.39.18]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:03:32.655+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:04:06.483+04:00]]></timeUpdated>
<displayNumber><![CDATA[123]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/fanboy-social.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -1024,9 +1024,9 @@
<name><![CDATA[Adblock Warning Removal List]]></name>
<description><![CDATA[removes anti-adblock warnings and other obtrusive messages]]></description>
<homepage><![CDATA[https://easylist.adblockplus.org/]]></homepage>
<version><![CDATA[1.0.39.24]]></version>
<version><![CDATA[1.0.39.25]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:04:34.253+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:05:07.353+04:00]]></timeUpdated>
<displayNumber><![CDATA[207]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/antiadblockfilters.txt]]></subscriptionUrl>
<languages/>
Expand All @@ -1038,9 +1038,9 @@
<name><![CDATA[Malware Domains]]></name>
<description><![CDATA[malware protection]]></description>
<homepage><![CDATA[http://malwaredomains.com/]]></homepage>
<version><![CDATA[1.0.39.13]]></version>
<version><![CDATA[1.0.39.14]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:04:42.625+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:05:15.828+04:00]]></timeUpdated>
<displayNumber><![CDATA[208]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/malwaredomains_full.txt]]></subscriptionUrl>
<languages/>
Expand Down Expand Up @@ -1094,9 +1094,9 @@
<name><![CDATA[RU AdList: Counters]]></name>
<description><![CDATA[Дополнение против счетчиков]]></description>
<homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
<version><![CDATA[1.0.35.79]]></version>
<version><![CDATA[1.0.35.80]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:05:11.815+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:05:44.407+04:00]]></timeUpdated>
<displayNumber><![CDATA[212]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/cntblock.txt]]></subscriptionUrl>
<languages/>
Expand All @@ -1108,9 +1108,9 @@
<name><![CDATA[RU AdList: BitBlock]]></name>
<description><![CDATA[Дополнение против мусора]]></description>
<homepage><![CDATA[https://code.google.com/p/ruadlist/]]></homepage>
<version><![CDATA[1.0.36.6]]></version>
<version><![CDATA[1.0.36.7]]></version>
<expires><![CDATA[21600]]></expires>
<timeUpdated><![CDATA[2015-07-01T14:05:20.123+04:00]]></timeUpdated>
<timeUpdated><![CDATA[2015-07-01T18:05:52.620+04:00]]></timeUpdated>
<displayNumber><![CDATA[213]]></displayNumber>
<subscriptionUrl><![CDATA[https://easylist-downloads.adblockplus.org/bitblock.txt]]></subscriptionUrl>
<languages/>
Expand Down
10 changes: 9 additions & 1 deletion Extension/lib/content-script/subscribe.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,15 @@
e.preventDefault();
e.stopPropagation();

var urlParams = target.search.substring(1).split('&');
var urlParams;
if (target.search) {
urlParams = target.search.substring(1).split('&');
} else {
var href = target.href;
var index = href.indexOf('?');
urlParams = href.substring(index + 1).split('&');
}

var subParams = getSubscriptionParams(urlParams);
var url = subParams.url;
var title = subParams.title || url;
Expand Down
2 changes: 1 addition & 1 deletion Extension/lib/pages/popup-controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ PopupController.prototype = {
}
}

if (this.abusePanelSupported) {
if (this.abusePanelSupported && !tabInfo.urlFilteringDisabled) {
el.append(this.abuseTemplate);
}

Expand Down

0 comments on commit 15c5278

Please sign in to comment.