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

code review for #456

This commit is contained in:
gorhill 2015-01-01 21:14:53 -05:00
parent 2a7e9f8d98
commit 2d05d51664
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
platform/chromium/vapi-client.js
View File

@ -33,16 +33,16 @@
self.vAPI = self.vAPI || {};
// https://github.com/gorhill/uBlock/issues/456
// Already injected?
if ( vAPI.vapiClient ) {
return;
}
vAPI.vapiClient = true;
var chrome = self.chrome;
var vAPI = self.vAPI;
// https://github.com/gorhill/uBlock/issues/456
// Already injected?
if ( vAPI.vapiClientInjected ) {
return;
}
vAPI.vapiClientInjected = true;
vAPI.chrome = true;
/******************************************************************************/

15
src/js/contentscript-end.js
View File

@ -21,12 +21,14 @@
/* global vAPI */
'use strict';
/******************************************************************************/
// Injected into content pages
(function() {
'use strict';
/******************************************************************************/
if ( vAPI.canExecuteContentScript() !== true ) {
@ -35,10 +37,10 @@ if ( vAPI.canExecuteContentScript() !== true ) {
// https://github.com/gorhill/uBlock/issues/456
// Already injected?
if ( vAPI.contentscriptEnd ) {
if ( vAPI.contentscriptEndInjected ) {
return;
}
vAPI.contentscriptEnd = true;
vAPI.contentscriptEndInjected = true;
/******************************************************************************/
@ -684,3 +686,8 @@ var messager = vAPI.messaging.channel('contentscript-end.js');
})();
/******************************************************************************/
/******************************************************************************/
})();
/******************************************************************************/

6
src/js/contentscript-start.js
View File

@ -46,10 +46,10 @@ if ( vAPI.canExecuteContentScript() !== true ) {
// https://github.com/gorhill/uBlock/issues/456
// Already injected?
if ( vAPI.contentscriptStart ) {
if ( vAPI.contentscriptStartInjected ) {
return;
}
vAPI.contentscriptStart = true;
vAPI.contentscriptStartInjected = true;
/******************************************************************************/
@ -64,7 +64,7 @@ var localMessager = vAPI.messaging.channel('contentscript-start.js');
var cosmeticFilters = function(details) {
var donthideCosmeticFilters = {};
var hideCosmeticFilters = {};
style = document.createElement('style');
var style = document.createElement('style');
style.setAttribute('id', 'ublock-preload-1ae7a5f130fc79b4fdb8a4272d9426b5');
var donthide = details.cosmeticDonthide;
var hide = details.cosmeticHide;