Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sitexw committed Mar 4, 2016
1 parent a2ca489 commit 8115d8a
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion 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)
Expand Down
7 changes: 3 additions & 4 deletions blockadblock.js
@@ -1,5 +1,5 @@
/*
* BlockAdBlock 3.2.0
* BlockAdBlock 3.2.1
* Copyright (c) 2015 Valentin Allaire <valentin.allaire@sitexw.fr>
* Released under the MIT license
* https://github.com/sitexw/BlockAdBlock
Expand All @@ -17,7 +17,7 @@
debug: false
};
this._var = {
version: '3.2.0',
version: '3.2.1',
bait: null,
checking: false,
loop: null,
Expand Down Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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",
Expand Down
2 changes: 1 addition & 1 deletion 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",
Expand Down
4 changes: 2 additions & 2 deletions test.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
<title>BlockAdBlock 3.2.0</title>
<title>BlockAdBlock 3.2.1</title>

<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
Expand Down Expand Up @@ -40,7 +40,7 @@
<div class="container">
<header class="row">
<div class="col-sm-6">
<h1>BlockAdBlock <small>3.2.0</small></h1>
<h1>BlockAdBlock <small>3.2.1</small></h1>
</div>
<div class="col-sm-6 text-right">
<h4>
Expand Down

0 comments on commit 8115d8a

Please sign in to comment.