CodeMirror/uMatrix
1
0
Fork 0
mirror of https://github.com/gorhill/uMatrix.git synced 2024-06-01 18:10:17 +12:00
Code Issues Releases Wiki Activity

jshint

Browse source
This commit is contained in:
gorhill 2015-04-19 09:34:50 -04:00
parent 0b1ddfa17b
commit 764b1a0b7a
3 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
platform/firefox/vapi-background.js
View file

@ -19,7 +19,7 @@
Home: https://github.com/gorhill/uMatrix
*/
/* jshint esnext: true, bitwise: false */
/* jshint bitwise: false, boss: true, esnext: true */
/* global self, Components, punycode, µBlock */
// For background page
@ -747,9 +747,9 @@ vAPI.setIcon = function(tabId, iconId, badge) {
var iconStatus = typeof iconId === 'number';
// If badge is undefined, then setIcon was called from the TabSelect event
var win = badge === undefined
? iconId
: Services.wm.getMostRecentWindow('navigator:browser');
var win = badge === undefined ?
iconId :
Services.wm.getMostRecentWindow('navigator:browser');
var curTabId = vAPI.tabs.getTabId(getTabBrowser(win).selectedTab);
var tb = vAPI.toolbarButton;
@ -1322,7 +1322,7 @@ vAPI.net.registerListeners = function() {
var details = e.data;
var browser = e.target;
var tabId = vAPI.tabs.getTabId(browser);
//console.debug("nsIWebProgressListener: onLocationChange: " + details.url + " (" + details.flags + ")");
// LOCATION_CHANGE_SAME_DOCUMENT = "did not load a new document"
@ -1657,9 +1657,15 @@ vAPI.contextMenu.displayMenuItem = function({target}) {
var ctxMap = vAPI.contextMenu.contextMap;
for ( var context of ctx ) {
if ( context === 'page' && !gContextMenu.onLink && !gContextMenu.onImage
&& !gContextMenu.onEditableArea && !gContextMenu.inFrame
&& !gContextMenu.onVideo && !gContextMenu.onAudio ) {
if (
context === 'page' &&
!gContextMenu.onLink &&
!gContextMenu.onImage &&
!gContextMenu.onEditableArea &&
!gContextMenu.inFrame &&
!gContextMenu.onVideo &&
!gContextMenu.onAudio
) {
menuitem.hidden = false;
return;
}

20
platform/firefox/vapi-client.js
View file

@ -19,6 +19,7 @@
Home: https://github.com/gorhill/uMatrix
*/
/* jshint boss: true, esnext: true */
/* global addMessageListener, removeMessageListener, sendAsyncMessage */
// For non background pages
@ -112,16 +113,15 @@ vAPI.messaging = {
addMessageListener(this.connector);
this.channels['vAPI'] = {};
this.channels['vAPI'].listener = function(msg) {
if ( msg.cmd === 'injectScript' ) {
var details = msg.details;
if ( !details.allFrames && window !== window.top ) {
return;
this.channels.vAPI = {
listener: function(msg) {
if ( msg.cmd === 'injectScript' ) {
var details = msg.details;
if ( !details.allFrames && window !== window.top ) {
return;
}
self.injectScript(details.file);
}
self.injectScript(details.file);
}
};
},
@ -195,7 +195,7 @@ window.addEventListener('pageshow', vAPI.messaging.toggleListener, true);
// we are not a top window (because element picker can still
// be injected in top window).
if ( window !== window.top ) {
// Can anything be done?
// Can anything be done?
}
/******************************************************************************/

1
platform/firefox/vapi-common.js
View file

@ -19,6 +19,7 @@
Home: https://github.com/gorhill/uMatrix
*/
/* jshint esnext: true */
/* global sendAsyncMessage */
// For background page or non-background pages