1
0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-18 00:13:30 +01:00
Commit Graph

746 Commits

Author SHA1 Message Date
gorhill
b436f8e829 this fixes #490 2015-01-13 11:54:54 -05:00
gorhill
5ec300602a this fixes default tab selection for Firefox 2015-01-13 11:01:33 -05:00
Deathamns
b4ea545412 Implement vAPI.insertHTML
The purpose of this API is basically to satisfy AMO reviewers in the
future, since the use of innerHTML with variables (i.e., not plain text) will
be rejected without any questions.

Since this is not a problem for browsers other than Firefox, they will
use simple innerHTML assignment, however safe-parsing could be implemented
for them too.
2015-01-13 07:30:07 +01:00
Deathamns
8a9165daa2 Firefox: blocking improvements / other fixes
- Implement pop-up blocking
- Support blocking redirected requests
- Fix Local mirroring and inline-script blocking
- Block content on data: and about:blank pages
2015-01-13 07:29:56 +01:00
Deathamns
5e55ba772d Code styling 2015-01-13 07:29:49 +01:00
Deathamns
b8c943d539 Make vAPI.setIcon less Chromium specific 2015-01-13 07:29:46 +01:00
Deathamns
b301ac031e Popup related changes 2015-01-13 07:29:44 +01:00
Deathamns
cb5d860725 Firefox: implement toolbar button and popup 2015-01-13 07:29:01 +01:00
Deathamns
3c76c61f61 Firefox: partial vAPI.tabs implementation 2015-01-13 07:28:57 +01:00
gorhill
42937eb1b1 this fixes #482 2015-01-12 10:10:03 -05:00
gorhill
5201946c3f this fixes #473 2015-01-11 09:47:14 -05:00
gorhill
8ff2dc362c this fixes #471 2015-01-11 08:31:38 -05:00
gorhill
a3d166d18e jshint 2015-01-10 11:44:37 -05:00
gorhill
80ef8f3777 code review 2015-01-10 11:32:24 -05:00
gorhill
9fc136e7e8 hopefully this fixes #470 2015-01-10 11:23:28 -05:00
gorhill
58e3acd0c7 probably more reasonable 2015-01-09 14:34:50 -05:00
gorhill
e6793c1fdb code review re #26 2015-01-09 00:06:28 -05:00
gorhill
ba31014503 support elemhide filter option 2015-01-08 21:04:48 -05:00
gorhill
0c152b2859 fixed flawed 1st-/3rd-party test 2015-01-08 10:37:19 -05:00
gorhill
bdf770a1bb need to maybe skip type after transposition 2015-01-07 20:42:19 -05:00
gorhill
ae2eb25e25 also log root document for convenience 2015-01-07 18:56:03 -05:00
gorhill
3e084455a7 regression 2015-01-07 18:38:05 -05:00
gorhill
cf446e97c8 output localized numbers 2015-01-07 17:42:13 -05:00
gorhill
cef1ac0ec9 regression 2015-01-07 14:24:06 -05:00
gorhill
d639c63670 code review 2015-01-07 11:36:23 -05:00
gorhill
f36880315a code review: fixed reloading of dynamic filtering rules 2015-01-07 08:49:52 -05:00
gorhill
2bed24bb99 code review 2015-01-06 19:51:50 -05:00
gorhill
ace190a33e regression 2015-01-06 15:35:08 -05:00
gorhill
4b9fc6d6f5 fixed import/export of dynamic rules 2015-01-06 12:14:37 -05:00
gorhill
881e8111d8 "advanced user" flag + rearranging a bit dashboard 2015-01-06 11:44:06 -05:00
gorhill
3a5c2cfa57 code review 2015-01-06 08:44:19 -05:00
gorhill
1597ce7fd9 lot of work related to dynamic filtering + new net requests logger 2015-01-06 08:01:15 -05:00
gorhill
81e035589b Merge branch 'master' of github.com:gorhill/uBlock into fix-433 2015-01-04 10:04:59 -05:00
gorhill
ea2043c0eb auto cleanup of listeners 2015-01-04 10:03:51 -05:00
gorhill
e8045d154b bringing changes from master 2015-01-02 14:19:12 -05:00
gorhill
00995992d2 this fixes #455 2015-01-02 13:42:35 -05:00
gorhill
2d05d51664 code review for #456 2015-01-01 21:14:53 -05:00
gorhill
2a7e9f8d98 this fixes #456: another unrelated bug unveil from previous fix 2015-01-01 20:58:19 -05:00
gorhill
057e95bed0 fixed comment 2015-01-01 19:16:02 -05:00
gorhill
33d73b343d this fixes #456 2015-01-01 19:09:40 -05:00
gorhill
4cbfb0fa6b semantically better 2015-01-01 10:57:03 -05:00
gorhill
5bfe3b09a7 filtering result has been refactored 2015-01-01 10:55:00 -05:00
gorhill
df2db73fb1 bringing branch up to date with master 2015-01-01 09:40:14 -05:00
gorhill
8562f70144 avoid potential double execution of firstRetrieveHandler (because mutations observer) 2015-01-01 09:15:37 -05:00
gorhill
aca35e4cbc code review for #452: avoid if'ing each time 2015-01-01 08:09:44 -05:00
gorhill
4c7533b786 code review for #452 2015-01-01 07:46:33 -05:00
gorhill
619b89e6a6 avoid dom changes if possible 2015-01-01 07:29:28 -05:00
gorhill
3b0dac6402 Merge branch 'master' of github.com:gorhill/uBlock into fix-433 2014-12-31 23:24:07 -05:00
gorhill
baa0fee0f3 this fixes #452 2014-12-31 23:09:22 -05:00
gorhill
3c941f8309 another round of work re dynamic filtering 2014-12-31 17:26:17 -05:00
gorhill
43e773aab2 finally a fully working draft: now onto myriad finishing touches 2014-12-31 10:47:19 -05:00
gorhill
a0279b1378 more work to expand dynamic filtering 2014-12-30 16:36:29 -05:00
gorhill
b49b0864d3 code review: #433 2014-12-28 12:04:48 -05:00
gorhill
1fe7045b92 too many changes for #433: branching so that I can commit and keep working on it 2014-12-28 10:07:43 -05:00
gorhill
aed66e5278 code review for #438 2014-12-27 13:42:47 -05:00
gorhill
c0b9e634b3 this fixes #438 2014-12-26 15:26:44 -05:00
gorhill
f60f149531 1000 is k, not K 2014-12-24 08:11:22 -05:00
gorhill
8eaa92f0a2 for debugging purpose when investigating 2014-12-22 18:38:18 -05:00
gorhill
e904e96d4d this fixes #436 2014-12-22 14:48:17 -05:00
gorhill
97bf6e279e further fix re #426 2014-12-21 00:07:08 -05:00
gorhill
4f229c7c27 this fixes #426 2014-12-20 15:28:16 -05:00
gorhill
59abd062ef #423: code review (oops) 2014-12-19 14:06:55 -05:00
gorhill
0cdc703f13 #423: code review 2014-12-19 14:04:17 -05:00
gorhill
6fc7f96a48 this fixes #423 2014-12-19 14:00:46 -05:00
gorhill
0d3dd3d2ec code review for #420: mind that the rule can apply everywhere 2014-12-17 10:47:52 -05:00
gorhill
b9c1f2e397 this fixes #420 2014-12-17 10:32:50 -05:00
gorhill
ceb36732cc jshint 2014-12-17 10:09:08 -05:00
gorhill
a7c9134bf6 this fixes #417 2014-12-17 08:04:21 -05:00
gorhill
5019f241df this fixes #418; also remove last chrome API reference from portable code 2014-12-17 08:02:37 -05:00
gorhill
a1172b1efe code review related to #405 2014-12-15 14:37:09 -05:00
gorhill
49d77eab05 more changes related to fix to #405 2014-12-15 11:02:50 -05:00
gorhill
084a1ef8d0 # is allowed with fix to #405 2014-12-15 09:28:56 -05:00
gorhill
22fe58e59a this fixes #414 2014-12-15 09:00:49 -05:00
gorhill
f7860cab7c this fixes #343 2014-12-15 07:19:32 -05:00
gorhill
b12bc6a7cf code review for #405 2014-12-14 17:21:59 -05:00
gorhill
d5a3226066 this fixes #405 (and formerly closed-as-wontfix #162) 2014-12-14 08:57:00 -05:00
Raymond Hill
c8c01a8f91 code review, jshint 2014-12-12 20:59:47 -02:00
Raymond Hill
a85f64c562 this addresses #405 2014-12-08 15:37:35 -02:00
Raymond Hill
172f98d462 this should help with #402 2014-12-08 14:16:13 -02:00
Raymond Hill
a909cc48d4 this is a better solution for #400 2014-12-08 14:12:08 -02:00
Raymond Hill
dfe8eab846 this fixes #401 2014-12-06 15:28:19 -02:00
Raymond Hill
0501c0712a this fixes #399 2014-12-06 15:00:31 -02:00
Raymond Hill
cf8f5c26e5 this fixes #396 2014-12-04 11:33:44 -02:00
Raymond Hill
0e12797709 extension restart is platform-dependent 2014-12-02 14:02:17 -02:00
Deathamns
2a26448734 Safari: slightly better pop-up blocking 2014-12-01 21:09:25 +01:00
Raymond Hill
2e4c0a2bfe remove depending on vapi-appinfo.js 2014-12-01 14:25:33 -02:00
Raymond Hill
f6120299af this fixes #387 2014-11-30 19:42:49 -02:00
Raymond Hill
0bf088cd1e this fixes #386, #346, #299, #288, #285, #284, #279 2014-11-29 23:36:53 -02:00
Raymond Hill
be082cb666 this fixes #384; more reading required for a long-term solution--if any 2014-11-29 18:26:01 -02:00
Raymond Hill
52e8cb5338 file picker is gone: generate a unique filename each time 2014-11-29 16:04:34 -02:00
Raymond Hill
c6227289a6 code review 2014-11-27 09:41:28 -02:00
Raymond Hill
f141d6f769 fixed overzealous cosmetic filter bug introduced in #365 2014-11-26 17:26:33 -02:00
Raymond Hill
7e55dc898e code review 2014-11-26 16:32:10 -02:00
Raymond Hill
27eeea3618 no longer needed 2014-11-26 16:25:14 -02:00
Raymond Hill
fb1221a8a1 remove overhead of PSL for "3rd-party filters" tab 2014-11-26 15:45:36 -02:00
Raymond Hill
f149b2e340 jshint 2014-11-24 20:20:21 -02:00
Raymond Hill
369b038f92 jshint 2014-11-24 12:48:33 -02:00
Raymond Hill
dc16a5c673 this fixes #379 2014-11-24 11:28:36 -02:00
Deathamns
219eddab74 Ports cleanup
- Remove duplicate platform specific (from src/) and other unnecessary
  files
- Fix and update vapi-*.js files for Safari
- Add tools/make-safari.sh
- Move js/vapi-appinfo.js to meta/ (so, every vendor specific file will be
  at the same location)
2014-11-23 18:21:06 +01:00
Raymond Hill
281dc7038e this fixes #362 2014-11-21 10:05:59 -02:00
Raymond Hill
0d920e4e44 code review 2014-11-16 22:40:34 -02:00
Raymond Hill
81a0052f39 remove code failing at trying to be smart re. obsolete filter lists 2014-11-16 21:27:48 -02:00
Raymond Hill
c4838581fd this fixes #365 2014-11-16 17:06:29 -02:00
Raymond Hill
91276bebfb eliminate overhead of creating two funcs/closure for each port connection 2014-11-16 12:49:55 -02:00
Raymond Hill
338bf59507 give specific message handlers priority over default one 2014-11-16 11:09:28 -02:00
Raymond Hill
84c069dfaa continued: corralling platform-specific stuff into their meta folder 2014-11-16 00:21:13 -02:00
Raymond Hill
eafc96859c further separate platform-specific code 2014-11-15 16:15:11 -02:00
Deathamns
8f0b3cf592 Move MutationObserver shim
Since it will be used only for older Safari versions, move it to Safari
related code, so it doesn't pollute the content scripts.
2014-11-12 10:22:57 +01:00
Deathamns
36ad23a1db Respect defer attribute when mirroring 2014-11-11 16:33:50 +01:00
Deathamns
812da0900e Call XHR.open even if the request will be blocked
Without calling it an error may be thrown if other XHR parameters are set.
2014-11-11 16:32:17 +01:00
Deathamns
8edb628e1e Only top window should have type main_frame 2014-11-11 13:33:55 +01:00
Deathamns
2024ba1bcd Fix wrong fix in 4bf6664 2014-11-10 19:25:17 +01:00
Deathamns
fb0cacb44d Remove unnecessary messaging workaround
A better fix was introduced in e36c702 for this issue.

The actual problem was that Safari when sends a message from the
background to content, then it passes to all the frames in the target tab,
but it doesn't make copies, it passes only references to the same object,
so if one frame modifies the message, then other frames would have
received the modified message.
2014-11-10 08:11:49 +01:00
Deathamns
0d9d285608 Building extension files
Adds possibility to build extension files (Chrome and Safari) from
command line.

To run from the project directory:
python tools/build.py [meta]

If the optional `meta` argument is set, then only the manifest and
language files are uptated.
Without that everything is being built (extension files too) into the
`dist/build/version_number` folder.

For Chrome there will be two files, a crx, and a .zip file which
includes the key.pem private key (so this must not be shared,
it's just a bit help for publishing it to the Chrome Web Store).

Beside the extension files, update-files are generated too (for self
hosting - Safari needs it).
2014-11-09 18:58:46 +01:00
Deathamns
4bf6664d6b Fix double definition of length property in uDom
The `length` property of `DOMList` couldn't be re-defined, because earlier
an Object.defineProperty was used on the object without a setter.
2014-11-09 17:41:09 +01:00
Deathamns
30ef97a678 Fix messaging for Safari 2014-11-09 17:41:07 +01:00
Deathamns
6f2e449e61 Preferences button for Safari
Brings back the possibility to click a checkbox which opens the extension
settings from Safari's Preferences/Extensions.
2014-11-09 17:41:05 +01:00
Deathamns
e36c7022cf Messaging fixes
Checking the message name (and connectorId) is mandatory for Safari,
because when the background page sends a response back to a document,
then all the frames in its owner tab will receive the exact same
message, which could confuse the script in some cases.
2014-11-09 17:41:04 +01:00
Deathamns
d98a8161f9 Drop js-loader, updates from gorhill/uBlock/master 2014-11-09 17:41:02 +01:00
Deathamns
ba0b11aabe Use different page navigation detection for Safari
The beforeNavigate event wasn't reliable (sometimes didn't fire, sometimes
fired unnecessary when opening a link with the middle click - which had a
workaround previously, but that's also removed by this commit).

When the event didn't fire, the bindTabToPageStats method didn't run,
and the requests related to the tab weren't blocked.
2014-11-09 17:41:00 +01:00
Deathamns
d114bf21e7 Site-patching possibility for Safari
Safari's extension API doesn't provide a way to intercept requests
initiated by plugins, so those cases need special care (or at least the
popular sites).

This commit adds a new JS file (sitepatch-safari.js), which will store the
patches (if it's possible to create one) for specific sites.

As an example, this commit includes a technique for removing in-video ads
from YouTube videos.
2014-11-09 17:40:59 +01:00
Deathamns
7f57684e2b document.head isn't always available in Safari 2014-11-09 17:40:56 +01:00
Deathamns
bccf3d68e2 Add dummy MutationObserver shim for older browsers 2014-11-09 17:40:54 +01:00
Deathamns
64c37ccd1d Badge number sometimes disappeared in Safari 2014-11-09 17:40:52 +01:00
Deathamns
f6f85ec793 Implement pop-up blocking for Safari
It works similarly to the xhr intercepting, except here the window.open
global function is being overridden.
Note that it could only work if the site's Content Security Policy allows
inline scripts, and the script on the webpage doesn't have a copy of the
original window.open function (it can happen only if the page has an
inline script in its head element, where the reference to the original
function can be obtained - likely this cannot be prevented in Safari).
2014-11-09 17:40:44 +01:00
Deathamns
ac272afb4b "Purge all caches" button seemingly didn't work 2014-11-09 17:40:43 +01:00
Deathamns
cc27193147 Element picker tweaks
- Indentation whitespace fixes.
- Use built-in getBoundingClientRect() function instead of self-made.
- Use built-in DOM API for manipulating the class attributes instead of
  altering the className property.
- Add pointer-events: none to the svgRoot when using
  document.elementFromPoint(), but if the browser (older Safari for
  example) doesn't take the pointer-events into account, then fall back to
  display: none.
- Initiate every part of the picker at the same time; when the message is
  received from the background. This way the selected element will have
  the red overlay immediately, instead of showing first the black overlay,
  then a few milliseconds later the red.
2014-11-09 17:40:41 +01:00
Deathamns
6d49ef0dac Avoid using Chrome's @@bidi_* type i18n messages
... for the sake of portability.

When including vapi-common.js in an HTML file, then the body element there
will have a "dir" attribute filled with the current locale's direction
(ltr or rtl).

The following languages are considered right-to-left: ar, he, fa, ps, ur.
Everything else is left-to-right.

After the "dir" attribute is set, we can decide in CSS which elements
should have different styling for rtl languages (e.g., body[dir=rtl] #id).
2014-11-09 17:40:40 +01:00
Deathamns
86222cb368 Use utf-8 for data: URIs when downloading 2014-11-09 17:39:43 +01:00
Deathamns
5e587aa42f Workaround for a messaging bug in Safari 2014-11-09 17:39:42 +01:00
Deathamns
5e99ead9ff Fix download URL for the fallback method 2014-11-09 17:39:40 +01:00
Deathamns
749b6f186d Use a dedicated file for storing extension info
Chrome has getManifest(), Safari doesn't have anything, Firefox has an
asynchronous API...
So, instead of using extension APIs, store the common informations
(extension name, version, homepage url) in a file (vapi-appinfo.js), which
can be included when it's needed (its data will be available at vAPI.app.____).
The file's content is updated each time the extension is being built, so
it shouldn't be modified manually.
2014-11-09 17:39:38 +01:00
Deathamns
fbffc5b07e Use HTML5 download instead of extension API
Benefits:
- Cross browser solution (however only for relatively new browsers)
- Doesn't need extra permission in Chrome

If the browser doesn't suppor the download attribute, then a new tab will
be opened with the exported data.

Other changes:
- Start the download only if the data is not empty (previously the
  download started anyway)
- Reorder code in vapi-client.js for Safari, so unnecessary code doesn't
  run on extension pages
2014-11-09 17:39:36 +01:00
Deathamns
2e787d8541 Set default dimensions for Safari's popup 2014-11-09 17:39:35 +01:00
Deathamns
ab12c8d7d9 Remove unnecessary comments 2014-11-09 17:39:33 +01:00
Deathamns
7dba1f7e22 Use extension API to open links from the popup
Safari doesn't seem to follow links embedded in the popup window (not even
with target="_blank").
2014-11-09 17:39:31 +01:00
Deathamns
d38ca13107 Script injection, element picker, messaging
- Add script injection to vAPI, plus a raw implementation for Safari
  (element-picker.js requires it)
- Tweak element picker to work with Safari
- Revert a change from previous commit: element-picker.js' background
  message handler (since actually it can have its own messaging channel)
- Don't send "undefined" reponses from background to content
2014-11-09 17:39:30 +01:00
Deathamns
88a7910bcb element-picker fixes, changes
- Include latest changes from gorhill/uBlock/master
- Append the pickerRoot container to document.documentElement instead
  of document.body ("body > div" type CSS selectors are more common, so
  they could overwrite the extension's styling with higher probability)
- Request localized strings from the background script instead of using
  the i18n API in content scripts
- Fuse element-picker.js' message handling into contentscript-end.js', since
  only one messaging channel can live at a time in a content script
2014-11-09 17:39:28 +01:00
Deathamns
f9602fa5a7 Implement popup autoresizing for Safari
By default, Safari doesn't resize the popup to its content, but it's
possible to set the size pragmatically.
The popup will be resized every time when a change happens in the DOM tree.
2014-11-09 17:39:26 +01:00
Deathamns
775f51a04b Fix "invalid token" exception in Safari
Seems like in older versions the const keyword doesn't play well with the "use strict" directive
2014-11-09 17:39:24 +01:00
Deathamns
1a83d1a753 Move vAPI into .jshintrc as a global 2014-11-09 17:39:22 +01:00
Deathamns
171619506b Remove storage change-event listener from Safari
Earlier, a technique was used to open the extension's Options page when
the user clicked a checkbox input at Safari's extension settings. The method was removed because:
- the Options page can be opened via the extension's toolbar button (which
  cannot be disabled in Safari, so it will be there all the time);
- involved more clicks than opening from the toolbar button;
- the string beside the checkbox couldn't be localized.
2014-11-09 17:39:20 +01:00
Deathamns
7af9805296 Safari shows integers only over the toolbar icon 2014-11-09 17:39:19 +01:00
Deathamns
0886f7e886 Add .jshintrc, and use the "use strict" directive
.jshintrc's otion-set is a personal choice, merely a suggestion.
Beside that, it includes some common globals for specific browsers, so
there's no need to set the globals in every .js file.

In order to force strict coding, "use strict" directive was added into
every .js file.
2014-11-09 17:39:17 +01:00
Deathamns
4278121f74 Minor changes
- Update assets from gorhill/uBlock/master
- Remove whitespace from element-picker.js
- Simplify code in profiler.js (btw, Date is still needed as fallback
  for older browsers)
- Clarification for Safari's storage where the QUOTA_BYTES came from
2014-11-09 17:39:15 +01:00
Deathamns
5b79bf3536 Work on vendor API abstraction, and near complete Safari support 2014-11-09 17:39:12 +01:00