Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work around for #2734 until fixed in Nightly

This commit is contained in:
gorhill 2017-07-03 09:51:34 -04:00
parent 20346ef0ed
commit a8382e821d
No known key found for this signature in database
GPG Key ID: 25E1490B761470C2
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/chromium/vapi-background.js
View File

@ -478,12 +478,12 @@ vAPI.tabs.open = function(details) {
var targetURLWithoutHash = pos === -1 ? targetURL : targetURL.slice(0, pos); var targetURLWithoutHash = pos === -1 ? targetURL : targetURL.slice(0, pos);
chrome.tabs.query({ url: targetURLWithoutHash }, function(tabs) { chrome.tabs.query({ url: targetURLWithoutHash }, function(tabs) {
if ( chrome.runtime.lastError ) { /* noop */ }
var tab = tabs[0]; var tab = tabs[0];
if ( !tab ) { if ( !tab ) {
wrapper(); wrapper();
return; return;
} }
var _details = { var _details = {
active: true, active: true,
url: undefined url: undefined

3
platform/webext/manifest.json
View File

@ -14,19 +14,16 @@
"commands": { "commands": {
"launch-element-zapper": { "launch-element-zapper": {
"suggested_key": { "suggested_key": {
"default": "Alt+Z"
}, },
"description": "__MSG_popupTipZapper__" "description": "__MSG_popupTipZapper__"
}, },
"launch-element-picker": { "launch-element-picker": {
"suggested_key": { "suggested_key": {
"default": "Alt+X"
}, },
"description": "__MSG_popupTipPicker__" "description": "__MSG_popupTipPicker__"
}, },
"launch-logger": { "launch-logger": {
"suggested_key": { "suggested_key": {
"default": "Alt+L"
}, },
"description": "__MSG_popupTipLog__" "description": "__MSG_popupTipLog__"
} }

13
src/js/popup.js
View File

@ -999,7 +999,6 @@ var onHideTooltip = function() {
uDom('#switch').on('click', toggleNetFilteringSwitch); uDom('#switch').on('click', toggleNetFilteringSwitch);
uDom('#gotoZap').on('click', gotoZap); uDom('#gotoZap').on('click', gotoZap);
uDom('#gotoPick').on('click', gotoPick); uDom('#gotoPick').on('click', gotoPick);
uDom('a[href]').on('click', gotoURL);
uDom('h2').on('click', toggleFirewallPane); uDom('h2').on('click', toggleFirewallPane);
uDom('#refresh').on('click', reloadTab); uDom('#refresh').on('click', reloadTab);
uDom('.hnSwitch').on('click', toggleHostnameSwitch); uDom('.hnSwitch').on('click', toggleHostnameSwitch);
@ -1009,6 +1008,18 @@ var onHideTooltip = function() {
uDom('body').on('mouseenter', '[data-tip]', onShowTooltip) uDom('body').on('mouseenter', '[data-tip]', onShowTooltip)
.on('mouseleave', '[data-tip]', onHideTooltip); .on('mouseleave', '[data-tip]', onHideTooltip);
// https://github.com/gorhill/uBlock/issues/2734
// Workaround until fixed in Firefox Nightly.
if ( typeof chrome.runtime.getBrowserInfo !== 'function' ) {
uDom('a[href]').on('click', gotoURL);
} else {
chrome.runtime.getBrowserInfo().then(function(info) {
if ( info.name !== 'Firefox' ) {
uDom('a[href]').on('click', gotoURL);
}
});
}
})(); })();
/******************************************************************************/ /******************************************************************************/

4
src/popup.html
View File

@ -17,8 +17,8 @@
<p id="basicTools"> <p id="basicTools">
<span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span> <span id="gotoZap" class="fa tool" data-i18n-tip="popupTipZapper" data-tip-position="under">&#xf0e7;</span>
<span id="gotoPick" class="fa tool" data-i18n-tip="popupTipPicker" data-tip-position="under">&#xf1fb;</span> <span id="gotoPick" class="fa tool" data-i18n-tip="popupTipPicker" data-tip-position="under">&#xf1fb;</span>
<a href="logger-ui.html" class="fa tool enabled" data-i18n-tip="popupTipLog" data-tip-position="under">&#xf022;</a> <a href="logger-ui.html" class="fa tool enabled" data-i18n-tip="popupTipLog" data-tip-position="under" target="uBOLogger">&#xf022;</a>
<a href="dashboard.html" class="fa tool enabled" data-i18n-tip="popupTipDashboard" data-tip-position="under">&#xf085;</a> <a href="dashboard.html" class="fa tool enabled" data-i18n-tip="popupTipDashboard" data-tip-position="under" target="uBODashboard">&#xf085;</a>
</p> </p>
<h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2> <h2 id="dfToggler" data-i18n="popupBlockedRequestPrompt">&nbsp;</h2>
<p class="statName"> <p class="statName">