Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Potential fix for #38 #45

Open
wants to merge 250 commits into
base: safari
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
250 commits
Select commit Hold shift + click to select a range
8641e64
not sure this is the best solution, how often does uBlock restart?
geoffdutton May 16, 2017
28c56e5
add existing tabs to tab manager
geoffdutton May 17, 2017
a217ca4
fix https://github.com/nikrolls/uBlock-Edge/issues/101
gorhill Jan 13, 2018
605dcc9
fix #2283
gorhill Jan 13, 2018
888d36f
fix #3433
gorhill Jan 13, 2018
206f547
Merge branch 'master' of github.com:gorhill/uBlock
gorhill Jan 13, 2018
f7d7657
new revision for release candidate
gorhill Jan 13, 2018
ecb5ca3
import translation work from https://crowdin.com/project/ublock
gorhill Jan 13, 2018
9fc8b54
replace "no" locale by "nb"
gorhill Jan 13, 2018
32bde27
Use rawgit.com to download filter list (#3438)
farrokhi Jan 15, 2018
1c46803
fix #3441
gorhill Jan 16, 2018
568c1d4
new revision for release candidate
gorhill Jan 16, 2018
55be872
import translation work from https://crowdin.com/project/ublock
gorhill Jan 16, 2018
25e74f2
correct authorship
vassudanagunta Oct 18, 2017
dada3fe
import translation work from https://crowdin.com/project/ublock
gorhill Jan 18, 2018
51fc602
fix #3450
gorhill Jan 20, 2018
37cf0d0
Fix #89
el1t Jan 24, 2018
a9e2da8
Fix #88, catch up to 1.14.24
el1t Jan 24, 2018
3e82725
Merge pull request #71 from vassudanagunta/safari
el1t Jan 29, 2018
f24f959
Fix author formatting
el1t Jan 29, 2018
36da71f
import translation work from https://crowdin.com/project/ublock
gorhill Jan 30, 2018
6602ed2
import translation work from https://crowdin.com/project/ublock
gorhill Jan 31, 2018
fb4d412
new revision for release
gorhill Jan 31, 2018
7f9435f
import Kazakh translation work
gorhill Jan 31, 2018
0262869
new revision for release
gorhill Feb 3, 2018
613ff9c
tentatively fix #3478: need feedback from reporter
gorhill Feb 3, 2018
ae4677c
new revision for release candidate
gorhill Feb 3, 2018
d1d96ba
new revision for stable release
gorhill Feb 3, 2018
43eab7a
import translation work from https://crowdin.com/project/ublock
gorhill Feb 3, 2018
f6afd8c
help address https://github.com/nikrolls/uBlock-Edge/pull/103
gorhill Feb 4, 2018
99ca4ce
new revision for dev build
gorhill Feb 5, 2018
b060064
add instruction URL to POL filter list
gorhill Feb 8, 2018
94c8cfc
fix #3506
gorhill Feb 12, 2018
5244bfb
Put the remarks as comments in ISSUE_TEMPLATE.MD (#2620)
devnoname120 Feb 12, 2018
2e770f1
Update ISSUE_TEMPLATE.md
gorhill Feb 12, 2018
baf939e
new revision for dev build
gorhill Feb 12, 2018
473358c
import translation work from https://crowdin.com/project/ublock
gorhill Feb 12, 2018
c0f25d1
fix https://github.com/uBlockOrigin/uAssets/issues/1546
gorhill Feb 15, 2018
17930cc
fix #3474, #2823
gorhill Feb 15, 2018
e65d710
new revision for dev build
gorhill Feb 15, 2018
7e68061
new revision fro dev build
gorhill Feb 15, 2018
4715256
import emergency fix from 1.15.6
gorhill Feb 15, 2018
287f04b
code review for #3474, #2823: simplify management of "web accessible …
gorhill Feb 16, 2018
207a7b1
fix typos
gorhill Feb 16, 2018
f98cd53
new revision for dev build
gorhill Feb 16, 2018
b2ff50f
abandon separate, distinct webext version for dev build
gorhill Feb 16, 2018
4ed0d87
code review: prevent redirection to WAR when request is xmlhttprequest
gorhill Feb 16, 2018
16a7ba8
new revision for dev build
gorhill Feb 16, 2018
c3f9f6b
code review: bit stricter code path
gorhill Feb 18, 2018
21f7d42
fix #3507
gorhill Feb 18, 2018
0c94716
import translation work from https://crowdin.com/project/ublock
gorhill Feb 18, 2018
c26d684
new revision for dev build
gorhill Feb 18, 2018
c2330cc
Merge tag '1.15.4' into safari
el1t Feb 19, 2018
ccfbdc6
remove now redundant POL filter list
gorhill Feb 20, 2018
267f769
new revision for dev build
gorhill Feb 21, 2018
6b7d8e7
bring out of band fixes (c5cbf5db47, 2999dbee5c) for Firefox/webext i…
gorhill Feb 21, 2018
a81d2a7
fix #3318, #3387
gorhill Feb 21, 2018
9fb455d
fix #3406
gorhill Feb 23, 2018
d42adc9
fix silly mistake in fix for #3526
gorhill Feb 23, 2018
d674e99
centralize the managing version string for all platform
gorhill Feb 23, 2018
0baed33
add needed files for self-hosting Firefox dev build of uBO
gorhill Feb 23, 2018
d2822a8
fix template as per https://developer.mozilla.org/en-US/Add-ons/Updates
gorhill Feb 24, 2018
a0505b2
import translation work from https://crowdin.com/project/ublock
gorhill Feb 24, 2018
218d0ee
fix updates.json
gorhill Feb 24, 2018
a6c4373
fix #3538 -- will refine script as needed with usage
gorhill Feb 24, 2018
25907a4
update installation instruction for Firefox/webext
gorhill Feb 24, 2018
aedb8fe
Update README.md
gorhill Feb 24, 2018
010edeb
fix #3547
gorhill Feb 25, 2018
64682ab
convert spaces to tabs
gorhill Feb 26, 2018
2c90158
fix #3546, #3428
gorhill Feb 26, 2018
67e06f5
offer concise version of often-used filter options (see https://githu…
gorhill Feb 26, 2018
943553b
new revision for dev build
gorhill Feb 26, 2018
94ebeea
fix code patching updates.json
gorhill Feb 26, 2018
7f41875
make dev build auto-update to 1.15.11b2
gorhill Feb 26, 2018
0414ce8
code review for #3428
gorhill Feb 26, 2018
7b92709
fine tune Firefox dev build publishing script
gorhill Feb 26, 2018
0db7dd6
new revision for dev build
gorhill Feb 26, 2018
7a33472
make dev build auto-update to 1.15.11b3
gorhill Feb 26, 2018
7eeba29
fix #3551: regressions as a result of fix to #3428
gorhill Feb 27, 2018
89246e4
new revision for dev build
gorhill Feb 27, 2018
94afd50
make Firefox dev build auto-update
gorhill Feb 27, 2018
5464041
Update README.md
gorhill Feb 28, 2018
48a40db
Update README.md
gorhill Feb 28, 2018
c84308d
minor code review of Python scripts
gorhill Feb 28, 2018
8456e47
Merge branch 'master' of github.com:gorhill/uBlock
gorhill Feb 28, 2018
ac7e012
start integration of codemirror to improve UI
gorhill Feb 28, 2018
cff1bcb
minor code review
gorhill Feb 28, 2018
61ec088
integrate codemirror into "My filters" pane
gorhill Feb 28, 2018
68c236e
new revision for dev build
gorhill Feb 28, 2018
4aa7164
make Firefox dev build auto-update
gorhill Mar 1, 2018
e5bb1ee
add credit for CodeMirror
gorhill Mar 1, 2018
273c805
fix rendering of comments starting with `#`
gorhill Mar 1, 2018
8680bbc
fine tuning codemirror styles
gorhill Mar 1, 2018
8b538de
import translation work from https://crowdin.com/project/ublock/
gorhill Mar 1, 2018
959f68c
fix #3494
gorhill Mar 1, 2018
8d5ebf4
support saving using keyboard (through codemirror) in "My filters"
gorhill Mar 1, 2018
8cf8706
fix #3562
gorhill Mar 1, 2018
8b3c287
new revision for dev build
gorhill Mar 1, 2018
634569b
make Firefox dev build auto-update
gorhill Mar 1, 2018
9132f61
Update CPU chart image with name ublock instead of μblock (#3566)
gene1wood Mar 2, 2018
b14011d
add CodeMirror's lib README to the package
gorhill Mar 2, 2018
d9350d7
Merge branch 'master' of github.com:gorhill/uBlock
gorhill Mar 2, 2018
bc61bef
address #3567
gorhill Mar 4, 2018
d6b7330
add missing stylesheet (#3567)
gorhill Mar 4, 2018
a693790
fix nonsensical "obsolete" status for user filters
gorhill Mar 4, 2018
c59ceff
code review: always search from current cursor position (#3567)
gorhill Mar 4, 2018
2c45971
code review: fine tuning look/behavior (#3567)
gorhill Mar 4, 2018
ee357ee
import translation work from https://crowdin.com/project/ublock
gorhill Mar 4, 2018
e54e27b
new revision for dev build
gorhill Mar 4, 2018
84ba3e9
make Firefox dev build auto-update
gorhill Mar 4, 2018
65e5554
fix resizing quirk due to new top panel (#3567)
gorhill Mar 4, 2018
1205156
prevent search bar from shrinking (#3567)
gorhill Mar 4, 2018
c4dfc14
new revision for dev build
gorhill Mar 4, 2018
1521d43
make Firefox dev build auto-update
gorhill Mar 5, 2018
9df0202
[codemirror] add active line addon
gorhill Mar 5, 2018
9b803a2
fine tuning syntax highlighter
gorhill Mar 5, 2018
ed8c9ac
add missing addon for 9df0202a0081
gorhill Mar 5, 2018
7a90a69
fine tuning syntax highlighter
gorhill Mar 5, 2018
ad57f6c
new version for dev build
gorhill Mar 5, 2018
9b2a490
"make Firefox dev build auto-update"
gorhill Mar 5, 2018
d8b629f
add commit/push to sign/publish script
gorhill Mar 5, 2018
d2be9ae
fix asset viewer rendering for mobile device
gorhill Mar 6, 2018
34efe9d
[codemirror] use inputStyle=contenteditable for better select-all per…
gorhill Mar 6, 2018
ec56165
new `script:inject` syntax, use only when next release is *very* wide…
gorhill Mar 6, 2018
15530df
code review: reset internal parser data once done parsing
gorhill Mar 6, 2018
a470c11
make options separator standout a bit better
gorhill Mar 6, 2018
333c6f6
fix #3580
gorhill Mar 7, 2018
081e5b4
fix #3581
gorhill Mar 7, 2018
dd979ff
code review: allow dev build of Firefox to update resources.txt
gorhill Mar 11, 2018
2aa7046
import original version of https://github.com/Swatinem/diff
gorhill Mar 11, 2018
caef7d0
add CodeMirror's merge.js addon + modify imported diff code for compa…
gorhill Mar 11, 2018
b10ac00
make use of CodeMirror in "My rules" pane
gorhill Mar 11, 2018
a09dbc6
new revision for dev build
gorhill Mar 11, 2018
c2ce20e
make Firefox dev build auto-update
gorhill Mar 11, 2018
eb78993
code review for b10ac0020da1: fix too rigid field separator
gorhill Mar 11, 2018
1e8d966
fix regression in Firefox legacy version
gorhill Mar 11, 2018
d1fbd0e
new revision for dev build
gorhill Mar 12, 2018
42a0574
make Firefox dev build auto-update
gorhill Mar 12, 2018
9715d1e
make use of CodeMirror for Whitelist pane
gorhill Mar 12, 2018
16e3846
dist/version
gorhill Mar 12, 2018
f0e9a71
make Firefox dev build auto-update
gorhill Mar 12, 2018
b42c128
increase min version of Pale Moon
gorhill Mar 12, 2018
b89ec28
fix #3594: incomplete conversion to CodeMirror widget
gorhill Mar 12, 2018
348ef0a
new revision for dev build
gorhill Mar 12, 2018
796152c
make Firefox dev build auto-update
gorhill Mar 12, 2018
d104ee2
Specify a transform value at 0% keyframe (#3598)
hiikezoe Mar 13, 2018
04cee14
fix https://github.com/gorhill/uMatrix/issues/967 (uBO-side)
gorhill Mar 13, 2018
95398b8
Merge branch 'master' of github.com:gorhill/uBlock
gorhill Mar 13, 2018
10c3825
new revision for dev build
gorhill Mar 13, 2018
51bae66
fix #3603
gorhill Mar 14, 2018
11ccb45
update fix for https://github.com/gorhill/uMatrix/issues/967
gorhill Mar 14, 2018
8414297
new revision for dev build
gorhill Mar 14, 2018
fe791b9
import translation work from https://crowdin.com/project/ublock
gorhill Mar 14, 2018
ea70cde
make Firefox dev build auto-update
gorhill Mar 14, 2018
e5eb0ac
remove comment with erroneous information
gorhill Mar 16, 2018
a3ee145
new revision for stable release
gorhill Mar 16, 2018
4c54cbf
...
gorhill Mar 16, 2018
7d11025
fix #3611
gorhill Mar 16, 2018
99b917d
new release revision for candidate
gorhill Mar 16, 2018
c92c0e8
make Firefox dev build auto-update
gorhill Mar 16, 2018
31eaa76
fix other quirks with rtl languages (#3611)
gorhill Mar 16, 2018
08f9933
new revision for release candidate
gorhill Mar 16, 2018
b860732
make Firefox dev build auto-update
gorhill Mar 16, 2018
6e84983
use LooseVersion instead of StrictVersion (because "rc")
gorhill Mar 16, 2018
fc850ec
force default pointer for find next-prev buttons
gorhill Mar 17, 2018
dbd34c4
force default pointer because Firefox legacy (#3611)
gorhill Mar 17, 2018
ac275fe
new revision for stable release
gorhill Mar 17, 2018
e40c394
new revision for dev build
gorhill Mar 17, 2018
940c459
make Firefox dev build auto-update
gorhill Mar 17, 2018
e26e70a
fix #3614
gorhill Mar 17, 2018
d29b409
remove use of innerHTML to please Firefox validator (see https://gith…
gorhill Mar 17, 2018
a44d8d4
new revision for dev build
gorhill Mar 17, 2018
443cc38
make Firefox dev build auto-update
gorhill Mar 17, 2018
23accd1
fix #3615
gorhill Mar 17, 2018
33fa25b
fix for gorhill/uBlock#3464 (#3616)
anvakl Mar 17, 2018
1b767ec
new revision for stable release
gorhill Mar 18, 2018
2afd991
fix #3624
gorhill Mar 18, 2018
96d4f98
use default codemirror input style, `contenteditable` interferes with…
gorhill Mar 18, 2018
981f669
new revision for dev build
gorhill Mar 18, 2018
4e1ba3b
make Firefox dev build auto-update
gorhill Mar 18, 2018
9ce1f8a
fix https://www.reddit.com/r/uBlockOrigin/comments/8524cf/my_custom_s…
gorhill Mar 19, 2018
4f2d071
new revision for dev build
gorhill Mar 19, 2018
6871d9a
add ability to filter out rules in "My rules" pane
gorhill Mar 21, 2018
431b40f
code review for 6871d9aed432
gorhill Mar 21, 2018
fca714c
code review for 6871d9aed432: mind rtl languages
gorhill Mar 21, 2018
a3daa80
make Firefox dev build auto-update
gorhill Mar 21, 2018
d9161ae
fix #3636
gorhill Mar 23, 2018
e35f6b3
code review: no need for callback arg
gorhill Mar 23, 2018
9dbc657
new revision for dev build
gorhill Mar 23, 2018
1986034
make Firefox dev build auto-update
gorhill Mar 23, 2018
1c9b2c9
revisit guideline for opening issues
gorhill Mar 23, 2018
4e38380
revisit guideline for opening issues
gorhill Mar 23, 2018
376c95b
#3646: find out if this makes a difference
gorhill Mar 27, 2018
6baded1
new revision for dev build
gorhill Mar 27, 2018
aa20a86
make Firefox dev build auto-update
gorhill Mar 27, 2018
827732a
revert attempted fix for #3646
gorhill Mar 27, 2018
222722c
make Firefox dev build auto-update
gorhill Mar 27, 2018
782faf4
fix #3646
gorhill Mar 27, 2018
84ec50c
new revision for dev build
gorhill Mar 27, 2018
25512b9
make Firefox dev build auto-update
gorhill Mar 27, 2018
f764435
various changes to enhance UI for mobile devices
gorhill Mar 28, 2018
b785a98
new revision for dev build
gorhill Mar 28, 2018
2e521e3
make Firefox dev build auto-update
gorhill Mar 28, 2018
88f0fd6
avoid spurious select-all
gorhill Mar 28, 2018
0a26fa1
new revision for dev build
gorhill Mar 28, 2018
b65923a
make Firefox dev build auto-update
gorhill Mar 28, 2018
fce2eaf
further improving UI for small screens
gorhill Mar 28, 2018
78b9187
new revision for dev build
gorhill Mar 28, 2018
6a5c938
make Firefox dev build auto-update
gorhill Mar 28, 2018
9fdda52
send cursor at the end when opening "My filters" pane
gorhill Mar 28, 2018
dd49e0a
oops, file picker button shouldn't be visible
gorhill Mar 28, 2018
0a879a8
treat behind-the-scene network requests like all others
gorhill Mar 30, 2018
ca0f3a2
make Firefox dev build auto-update
gorhill Mar 30, 2018
0451758
mind `rc` when deriving an integer from version string
gorhill Mar 30, 2018
e46b3cc
new revision for dev build
gorhill Mar 30, 2018
b22c193
make Firefox dev build auto-update
gorhill Mar 30, 2018
0ba8c33
make use of Chromium 63's webRequest's new property
gorhill Mar 30, 2018
b7e5c9a
make use of Chromium 63's webRequest's new `initiator` property
gorhill Mar 30, 2018
a1c5ddc
Merge branch 'master' of github.com:gorhill/uBlock
gorhill Mar 30, 2018
558b0e8
new revision for dev build
gorhill Mar 30, 2018
b08caef
make Firefox dev build auto-update
gorhill Mar 30, 2018
d122b4a
remove obsolete code
gorhill Mar 31, 2018
588a8ac
add default noop rules for behind-the-scene scope
gorhill Mar 31, 2018
b91c2a7
import translation work from https://crowdin.com/project/ublock
gorhill Mar 31, 2018
4bc5763
new revision for dev build
gorhill Mar 31, 2018
7c478eb
make Firefox dev build auto-update
gorhill Mar 31, 2018
2632cf6
code review for 588a8acc
gorhill Mar 31, 2018
8648341
new revision for dev build
gorhill Mar 31, 2018
94679b3
make Firefox dev build auto-update
gorhill Mar 31, 2018
9bc029b
allow un-whitelisting in non-advanced user mode
gorhill Mar 31, 2018
5c15f68
add workaround for Firefox's inability to redirect xhr to data: URI
gorhill Mar 31, 2018
f69c772
new revision for dev build
gorhill Mar 31, 2018
c5f870a
make Firefox dev build auto-update
gorhill Mar 31, 2018
cb060e5
code review for 5c15f685
gorhill Mar 31, 2018
17f31da
new revision for dev build
gorhill Apr 1, 2018
8a64ba6
code review for 5c15f68
gorhill Apr 1, 2018
67c1d90
make Firefox dev build auto-update
gorhill Apr 1, 2018
fd78f9b
remove experimental pseudo-redirector for the time being
gorhill Apr 2, 2018
8528338
new revision for release
gorhill Apr 2, 2018
2b92f11
fix dashboard icon issue for Pale Moon (#3665)
gorhill Apr 2, 2018
fe11ff6
mind whitelist directives for filterable behind-the-scene requests (#…
gorhill Apr 2, 2018
943a2b9
new revision for release
gorhill Apr 2, 2018
d4c882a
new revision for dev build
gorhill Apr 2, 2018
c70881e
make Firefox dev build auto-update
gorhill Apr 2, 2018
98df44c
invalidate resources selfie when new version is detected [Firefox]
gorhill Apr 2, 2018
33e87e1
Merge tag '1.15.24' into safari
el1t Apr 14, 2018
a32680d
Safari build: use version file
el1t Apr 16, 2018
a3dd866
not sure this is the best solution, how often does uBlock restart?
geoffdutton May 16, 2017
7e52856
add existing tabs to tab manager
geoffdutton May 17, 2017
1062b4a
Merge branch 'safari-reload-tabs-on-load' of github.com:geoffdutton/u…
geoffdutton Apr 18, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions platform/safari/vapi-background.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,7 @@ vAPI.tabs.registerListeners = function() {
if ( !vAPI.tabs.popupCandidate || !e.target || e.url === 'about:blank' ) {
return;
}

var targetUrl = e.url,
targetTabId = vAPI.tabs.getTabId(e.target).toString(),
openerTabId = vAPI.tabs.popupCandidate;
Expand Down Expand Up @@ -650,6 +651,7 @@ safari.application.addEventListener('deactivate', function(event) {
if ( !(event.target instanceof SafariBrowserTab) ) {
return;
}

// when a tab is deactivated...
var tabId = vAPI.tabs.getTabId(event.target),
state = iconStateForTabId[tabId];
Expand Down
14 changes: 11 additions & 3 deletions src/js/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ master switch and dynamic filtering rules can be evaluated now properly even
in the absence of a PageStore object, this was not the case before.

Also, the TabContext object will try its best to find a good candidate root
document URL for when none exists. This takes care of
document URL for when none exists. This takes care of
<https://github.com/chrisaljoudi/uBlock/issues/1001>.

The TabContext manager is self-contained, and it takes care to properly
Expand Down Expand Up @@ -426,7 +426,7 @@ housekeep itself.
var tabContext = lookup(tabId);
this.rootHostname = tabContext.rootHostname;
this.rootDomain = tabContext.rootDomain;
this.pageHostname =
this.pageHostname =
this.pageDomain =
this.requestURL =
this.requestHostname =
Expand Down Expand Up @@ -502,7 +502,7 @@ vAPI.tabs.onClosed = function(tabId) {

// https://github.com/gorhill/uBlock/issues/99
// https://github.com/gorhill/uBlock/issues/991
//
//
// popup:
// Test/close target URL
// popunder:
Expand Down Expand Up @@ -1019,6 +1019,14 @@ vAPI.setTimeout(pageStoreJanitor, pageStoreJanitorPeriod);

/******************************************************************************/

// Update existing tabs on load
(function () {
var tabStack = vAPI.tabs.stack || {};
for(var tabId in tabStack) {
vAPI.tabs.onUpdated(tabId, { url: tabStack[tabId].url }, tabStack[tabId]);
}
})();

})();

/******************************************************************************/