From 8115d8a83b24df42140cae8c84955504ebaaad12 Mon Sep 17 00:00:00 2001 From: Valentin Date: Fri, 4 Mar 2016 11:55:25 +0100 Subject: [PATCH] Miroir https://github.com/sitexw/FuckAdBlock/commit/da20a526928e4921691f7d693a1988f2e345d997 --- README.md | 2 +- blockadblock.js | 7 +++---- bower.json | 2 +- package.json | 2 +- test.html | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index fdf6bf7..526c68b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -BlockAdBlock (v3.2.0) +BlockAdBlock (v3.2.1) =========== ([FuckAdBlock](https://github.com/sitexw/FuckAdBlock) same project but with a more convenient name) diff --git a/blockadblock.js b/blockadblock.js index e938432..bca91a9 100644 --- a/blockadblock.js +++ b/blockadblock.js @@ -1,5 +1,5 @@ /* - * BlockAdBlock 3.2.0 + * BlockAdBlock 3.2.1 * Copyright (c) 2015 Valentin Allaire * Released under the MIT license * https://github.com/sitexw/BlockAdBlock @@ -17,7 +17,7 @@ debug: false }; this._var = { - version: '3.2.0', + version: '3.2.1', bait: null, checking: false, loop: null, @@ -155,8 +155,7 @@ } if(window.getComputedStyle !== undefined) { var baitTemp = window.getComputedStyle(this._var.bait, null); - if(baitTemp.getPropertyValue('display') == 'none' - || baitTemp.getPropertyValue('visibility') == 'hidden') { + if(baitTemp && (baitTemp.getPropertyValue('display') == 'none' || baitTemp.getPropertyValue('visibility') == 'hidden')) { detected = true; } } diff --git a/bower.json b/bower.json index 592213e..fd89d00 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "blockadblock", - "version": "3.2.0", + "version": "3.2.1", "description": "Detects ad blockers (AdBlock, ...)", "authors": [{ "name" : "Valentin Allaire", diff --git a/package.json b/package.json index 273fe9b..c150f9f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "blockadblock", - "version": "3.2.0", + "version": "3.2.1", "description": "Detects ad blockers (AdBlock, ...)", "author": { "name" : "Valentin Allaire", diff --git a/test.html b/test.html index b3558b2..379bff1 100644 --- a/test.html +++ b/test.html @@ -1,7 +1,7 @@ - BlockAdBlock 3.2.0 + BlockAdBlock 3.2.1 @@ -40,7 +40,7 @@
-

BlockAdBlock 3.2.0

+

BlockAdBlock 3.2.1