Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-16 23:42:39 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/chrisaljoudi/uBlock into chrisaljoudi

Browse Source
This commit is contained in:
gorhill 2015-04-18 17:26:52 -04:00
commit 403f395da8
11 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -9,7 +9,7 @@
* [What is uBlock?](#what-is-ublock)
* [Getting Started](#getting-started)
* [Getting Started & Installation](#getting-started)
* [Performance & Benchmarks](#performance)
* [Release History](#release-history)
* [Tips](#tips)

2
assets/checksums.txt
View File

@ -1,5 +1,5 @@
f4e2b58298d1d26dd0c65f3db849a15a assets/ublock/filter-lists.json
18ba7baebdb246100271a4cbd7100f74 assets/ublock/filters.txt
642bdd3188cda7fd04da49bce4f005c1 assets/ublock/filters.txt
c9c5cc56bec563bc1885847f925b9be2 assets/ublock/mirror-candidates.txt
ba85c7991d208fe26c8f74f57bb5cfe1 assets/ublock/privacy.txt
0d707b2cee4a38988662107971137d13 assets/thirdparties/abp.mozilla-hispano.org/nauscopio/filtros.txt

4
assets/ublock/filters.txt
View File

@ -306,4 +306,6 @@ deviantart.com##.dp-ad-chrome.dp-ad-visible
# Fixes https://github.com/chrisaljoudi/uBlock/issues/1240
# CNN
@@||cdn.turner.com$domain=cnn.com
# Also fixes https://github.com/chrisaljoudi/uBlock/issues/1271
# NBA.com
@@||cdn.turner.com/*/AdManager.js$domain=cnn.com|nba.com,script

4
src/css/3p-filters.css
View File

@ -140,10 +140,10 @@ span.new {
background-color: hsl(36, 100%, 75%);
}
#externalListsDiv {
margin: 2em auto 0 2em;
margin: 2em auto 0 1em;
}
body[dir=rtl] #externalListsDiv {
margin: 2em 2em 0;
margin: 2em 1em 0;
}
#externalLists {
box-sizing: border-box;

9
src/css/common.css
View File

@ -4,12 +4,13 @@
position: relative;
}
body [data-tip]:after {
background-color: #444;
background-color: #333;
border-radius: 3px;
box-sizing: border-box;
color: #eee;
content: attr(data-tip);
font-size: 12px;
font-weight: normal;
left: 0.5em;
line-height: 130%;
opacity: 0;
@ -24,10 +25,10 @@ body [data-tip]:after {
z-index: 20;
}
body [data-tip]:hover:after {
opacity: 1;
opacity: 0.9;
position: absolute;
transition: visibility 0s 0.6s, opacity 0.2s 0.7s;
-webkit-transition: visibility 0s 0.6s, opacity 0.2s 0.7s;
transition: visibility 0s 0.3s, opacity 0.2s 0.4s;
-webkit-transition: visibility 0s 0.3s, opacity 0.2s 0.4s;
visibility: visible;
}
body[dir=rtl] [data-tip]:hover:after {

11
src/css/popup.css
View File

@ -37,15 +37,18 @@ a {
padding: 4px;
padding-top: 5px;
color: #eee;
font-weight: bold;
background-color: #444;
text-align: center;
cursor: pointer;
}
#appname {
margin-left: 3px;
font-weight: bold;
}
#version {
font-size: 11px;
font-weight: normal;
margin-left: 1em;
font-size: 75%;
opacity: 0.8;
margin-left: 5px;
}
html {
font-size: 0;

16
src/img/icons.svg
View File

@ -12,6 +12,10 @@
<title>eraser</title>
<path class="path1" d="M478.036 783.673l178.286-203.755h-407.51l-178.286 203.755h407.51zM1015.546 212.204q7.958 18.041 5.041 37.939t-16.184 34.756l-475.429 543.348q-20.163 23.347-50.938 23.347h-407.51q-20.163 0-36.877-10.877t-25.204-28.919q-7.96-18.041-5.041-37.939t16.184-34.756l475.429-543.346q20.163-23.347 50.938-23.347h407.51q20.163 0 36.877 10.877t25.204 28.918z"></path>
</symbol>
<symbol id="icon-preferences" viewBox="0 0 1024 1024">
<title>preferences</title>
<path class="path1" d="M872.186 602.859c1.939-15.512 3.394-31.269 3.394-47.265s-1.455-31.753-3.394-47.265l102.529-80.23c9.211-7.271 11.876-20.36 5.817-31.026l-96.954-167.974c-6.059-10.422-18.664-14.785-29.572-10.422l-120.709 48.719c-24.965-19.149-52.355-35.389-81.927-47.751l-18.179-128.466c-2.181-11.393-12.12-20.36-24.239-20.36h-193.91c-12.12 0-22.057 8.968-23.996 20.36l-18.179 128.466c-29.572 12.362-56.96 28.359-81.927 47.751l-120.709-48.719c-10.907-4.122-23.512 0-29.572 10.422l-96.954 167.974c-6.059 10.422-3.394 23.512 5.817 31.026l102.287 80.23c-1.939 15.512-3.394 31.269-3.394 47.265s1.455 31.753 3.394 47.265l-102.287 80.23c-9.211 7.271-11.876 20.36-5.817 31.026l96.954 167.974c6.059 10.422 18.664 14.785 29.572 10.422l120.709-48.719c24.965 19.149 52.355 35.389 81.927 47.751l18.179 128.466c1.939 11.393 11.876 20.36 23.996 20.36h193.91c12.12 0 22.057-8.968 23.996-20.36l18.179-128.466c29.572-12.362 56.96-28.359 81.927-47.751l120.709 48.719c10.907 4.122 23.512 0 29.572-10.422l96.954-167.974c6.059-10.422 3.394-23.512-5.817-31.026l-102.287-80.23zM512 725.264c-93.805 0-169.671-75.866-169.671-169.671s75.866-169.671 169.671-169.671 169.671 75.866 169.671 169.671-75.866 169.671-169.671 169.671z"></path>
</symbol>
<symbol id="icon-eyedropper" viewBox="0 0 1024 1024">
<title>eyedropper</title>
<path class="path1" d="M986.51 37.49c-49.988-49.986-131.032-49.986-181.020 0l-172.118 172.118-121.372-121.372-135.764 135.764 106.426 106.426-472.118 472.118c-8.048 8.048-11.468 18.958-10.3 29.456h-0.244v160c0 17.674 14.328 32 32 32h160c0 0 2.664 0 4 0 9.212 0 18.426-3.516 25.456-10.544l472.118-472.118 106.426 106.426 135.764-135.764-121.372-121.372 172.118-172.118c49.986-49.988 49.986-131.032 0-181.020zM173.090 960h-109.090v-109.090l469.574-469.572 109.088 109.088-469.572 469.574z"></path>
@ -28,15 +32,19 @@
<title>stats</title>
<path class="path1" d="M0 832h1024v128h-1024zM128 576h128v192h-128zM320 320h128v448h-128zM512 512h128v256h-128zM704 128h128v640h-128z"></path>
</symbol>
<symbol id="icon-view" viewBox="0 0 1024 1024">
<title>view</title>
<path class="path1" d="M512 192c-223.318 0-416.882 130.042-512 320 95.118 189.958 288.682 320 512 320 223.312 0 416.876-130.042 512-320-95.116-189.958-288.688-320-512-320zM764.45 361.704c60.162 38.374 111.142 89.774 149.434 150.296-38.292 60.522-89.274 111.922-149.436 150.296-75.594 48.218-162.89 73.704-252.448 73.704-89.56 0-176.858-25.486-252.452-73.704-60.158-38.372-111.138-89.772-149.432-150.296 38.292-60.524 89.274-111.924 149.434-150.296 3.918-2.5 7.876-4.922 11.86-7.3-9.96 27.328-15.41 56.822-15.41 87.596 0 141.382 114.616 256 256 256 141.382 0 256-114.618 256-256 0-30.774-5.452-60.268-15.408-87.598 3.978 2.378 7.938 4.802 11.858 7.302v0zM512 416c0 53.020-42.98 96-96 96s-96-42.98-96-96 42.98-96 96-96 96 42.982 96 96z"></path>
</symbol>
<symbol id="icon-reload" viewBox="0 0 1024 1024">
<title>reload</title>
<path class="path1" d="M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z"></path>
<path class="path2" d="M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z"></path>
</symbol>
<symbol id="icon-view" viewBox="0 0 1024 1024">
<title>view</title>
<path class="path1" d="M320 768v-768h-128v768h-160l224 224 224-224h-160z"></path>
<path class="path2" d="M448 0h576v128h-576v-128z"></path>
<path class="path3" d="M448 192h448v128h-448v-128z"></path>
<path class="path4" d="M448 384h320v128h-320v-128z"></path>
<path class="path5" d="M448 576h192v128h-192v-128z"></path>
</symbol>
<symbol id="icon-filter" viewBox="0 0 1024 1024">
<title>filter</title>
<path class="path1" d="M512 0c-282.77 0-512 71.634-512 160v96l384 384v320c0 35.346 57.306 64 128 64 70.692 0 128-28.654 128-64v-320l384-384v-96c0-88.366-229.23-160-512-160zM94.384 138.824c23.944-13.658 57.582-26.62 97.278-37.488 87.944-24.076 201.708-37.336 320.338-37.336 118.628 0 232.394 13.26 320.338 37.336 39.696 10.868 73.334 23.83 97.28 37.488 15.792 9.006 24.324 16.624 28.296 21.176-3.972 4.552-12.506 12.168-28.296 21.176-23.946 13.658-57.584 26.62-97.28 37.488-87.942 24.076-201.708 37.336-320.338 37.336s-232.394-13.26-320.338-37.336c-39.696-10.868-73.334-23.83-97.278-37.488-15.792-9.008-24.324-16.624-28.298-21.176 3.974-4.552 12.506-12.168 28.298-21.176z"></path>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

3
src/js/3p-filters.js
View File

@ -76,6 +76,9 @@ var renderFilterLists = function() {
var renderElapsedTimeToString = vAPI.i18n.renderElapsedTimeToString;
var lastUpdateString = vAPI.i18n('3pLastUpdate');
// Don't lose the custom filter textbox
uDom('#templates').append(uDom('#externalListsDiv'));
// Assemble a pretty blacklist name if possible
var listNameFromListKey = function(listKey) {
if ( listKey === listDetails.userFiltersPath ) {

3
src/js/background.js
View File

@ -74,8 +74,7 @@ return {
'behind-the-scene',
'chrome-extension-scheme',
'chrome-scheme',
'opera-scheme',
''
'opera-scheme'
].join('\n').trim(),
localSettings: {

6
src/js/tab.js
View File

@ -464,9 +464,6 @@ vAPI.tabs.onPopup = function(details) {
if ( pageStore ) {
pageStore.logRequest(context, result);
}
if ( µb.userSettings.showIconBadge ) {
µb.updateBadgeAsync(details.openerTabId);
}
// Not blocked
if ( µb.isAllowResult(result) ) {
@ -474,6 +471,9 @@ vAPI.tabs.onPopup = function(details) {
}
// Blocked
if ( µb.userSettings.showIconBadge ) {
µb.updateBadgeAsync(details.openerTabId);
}
// It is a popup, block and remove the tab.
if(details.targetTabId !== "preempt") {

2
src/popup.html
View File

@ -10,7 +10,7 @@
</head>
<body>
<a href="dashboard.html" target="_blank" id="gotoPrefs" title="popupTipDashboard"><span id="appname">&nbsp;</span><span id="version">&nbsp;</span></a>
<a href="dashboard.html" target="_blank" id="gotoPrefs" data-i18n-tip="popupTipDashboard"><svg class="icon icon-preferences"><use xlink:href="img/icons.svg#icon-preferences"></use></svg> <span id="appname">&nbsp;</span> <span id="version">&nbsp;</span></a>
<div id="panes">
<div id="switchPane">
<p id="switch" data-i18n-tip="popupPowerSwitchInfo"><svg class="icon icon-power"><use xlink:href="img/icons.svg#icon-power"></use></svg></p>