Correcting small errors due to merge

sitexw · Mar 13, 2014 · bd9a693 · bd9a693
1 parent 862f682
commit bd9a693
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/fuckadblock.js b/fuckadblock.js
@@ -1,14 +1,5 @@
-/* 
-FuckAdBlock 2.2         - some modifications to the original script:
-						- removed automatic check at beginning because was failing in my case (window onload)
-						- added function "removeAll()" to dettach all the callbacks (to be able to conveniently use anonymous functions passed by value)
-						- removed the "body" closure and using document.body everywhere instead (trying to initialize the closure var on window load was kinda not always working)
-https://github.com/tchakabam/FuckAdBlock
-
-*/
-
 /*
-FuckAdBlock 2.1
+FuckAdBlock 2.2
 http://github.com/sitexw/FuckAdBlock
 */
 
@@ -89,4 +80,3 @@ function FuckAdBlock() {
 	var that = this;
 }
 var fuckAdBlock = new FuckAdBlock();
-
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/tchakabam/FuckAdBlock.git"
+    "url": "git://github.com/sitexw/FuckAdBlock.git"
   },
   "keywords": [
     "ad",
@@ -17,7 +17,7 @@
   ],
   "author": "Valentin Allaire <[email protected]>, Stephan Hesse <[email protected]>",
   "bugs": {
-    "url": "https://github.com/tchakabam/FuckAdBlock/issues"
+    "url": "https://github.com/sitexw/FuckAdBlock/issues"
   },
-  "homepage": "https://github.com/tchakabam/FuckAdBlock"
+  "homepage": "https://github.com/sitexw/FuckAdBlock"
 }
diff --git a/test.html b/test.html
@@ -2,7 +2,7 @@
 <html>
 <head>
 	<meta charset="utf-8">
-	<title>FuckAdBlock 2.0 Exemple</title>
+	<title>FuckAdBlock 2.2 Exemple</title>
 	<style>
 	body {
 		font-family: Arial;
@@ -13,7 +13,7 @@
 		background-color: red;
 	}
 	</style>
-	<script src="./fuckadblock.min.js"></script>
+	<script src="./fuckadblock.js"></script>
 	<script>
 	fuckAdBlock.add(true, function() {
 		alert('AdBlock detected !');