Merge branch 'v3.x'

sitexw · Mar 4, 2016 · b2f6c38 · b2f6c38
2 parents fbf00b5 + 8115d8a
commit b2f6c38
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git 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
@@ -1,5 +1,5 @@
 /*
- * BlockAdBlock 3.2.0
+ * BlockAdBlock 3.2.1
  * Copyright (c) 2015 Valentin Allaire <[email protected]>
  * 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
@@ -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
@@ -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
@@ -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">
@@ -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>