Code linting.

.eslintrc.json

@@ -11,15 +11,25 @@
         },
         "sourceType": "script"
     },
+    "extends": "eslint:recommended",
+    "globals": {
+        "exportFunction": false,
+        "settings": false
+    },
     "rules": {
+        "brace-style": ["warn", "stroustrup", {"allowSingleLine": true}],
+        "eqeqeq": "warn",
         "no-const-assign": "warn",
         "no-this-before-super": "warn",
         "no-undef": "warn",
         "no-unreachable": "warn",
-        "no-unused-vars": "warn",
+        "no-unused-vars": "off",
+        "no-trailing-spaces": ["warn", {"skipBlankLines": true}],
+        "no-mixed-spaces-and-tabs": ["warn", "smart-tabs"],
         "constructor-super": "warn",
         "valid-typeof": "warn",
-        "brace-style": "warn",
+        "quotes": ["error", "double"],
+        "semi": ["error", "always"],
         "strict": ["warn", "function"]
     }
 }

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+	// See https://go.microsoft.com/fwlink/?LinkId=733558
+	// for the documentation about the tasks.json format
+	"version": "2.0.0",
+	"tasks": [
+		{
+			"taskName": "eslint",
+			"type": "shell",
+			"windows": {
+				"command": "eslint"
+			},
+			"linux": {
+				"command": "eslint"
+			},
+			"osx": {
+				"command": "eslint"
+			},
+			"args": ["./"],
+			"presentation": {
+				"echo": true,
+				"reveal": "silent",
+				"focus": false,
+				"panel": "shared"
+			},
+			"problemMatcher": "$eslint-stylish"
+		}
+	]
+}

lib/askForPermission.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -25,7 +24,9 @@
 			try {
 				nodeName = context.nodeName;
 			}
-			catch (e){}
+			catch (e){
+				nodeName = "";
+			}
 			if (nodeName === "CANVAS"){
 				canvas = context;
 			}

lib/callingStack.js

@@ -1,5 +1,3 @@
-/* global exports */
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -21,7 +19,6 @@
 	// Translation
 	var translate = require("sdk/l10n").get;
 	var _ = function(name, replace, translateAPI){
-		"use strict";
 		if (!translateAPI){
 			translateAPI = translate;
 		}
@@ -38,8 +35,6 @@
 	
 	// Stack parsing
 	function parseStackEntry(entry){
-		"use strict";
-		
 		var m = /@(.*):(\d*):(\d*)$/.exec(entry) || ["", entry, "--", "--"];
 		return {
 			url: m[1],
@@ -67,8 +62,6 @@
 
 	// parse calling stack
 	function parseErrorStack(errorStack){
-		"use strict";
-		
 		var callers = errorStack.trim().split("\n");
 		var findme = callers.shift(); // Remove us from the stack
 		findme = findme.replace(/(:[0-9]+){1,2}$/, ""); // rm line & column

lib/check.js

@@ -1,5 +1,3 @@
-/* global console,exports */
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -19,7 +17,6 @@
 	const preferences = require("sdk/simple-prefs");
 	const prefs = preferences.prefs;
 	const {parseErrorStack} = require("./callingStack");
-	const {URL} = require("sdk/url");
 	const logging = require("./logging");
 
 	scope.check = function check({url, errorStack}){

lib/colorStatistics.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -37,24 +36,24 @@
 			color.count += 1;
 			if (color.count > color.nextColor.count){
 				// swap colors to remain in right order
-				// a -> b -> c -> d becomes a -> c -> b -> d
+				// a_ -> b_ -> c -> d becomes a_ -> c -> b_ -> d
-				var a = color.previousColor;
+				var a_ = color.previousColor;
-				var b = color;
+				var b_ = color;
 				var c = color.nextColor;
 				var d = color.nextColor.nextColor;
 				
-				a.nextColor = c;
+				a_.nextColor = c;
-				c.previousColor = a;
+				c.previousColor = a_;
 				
-				c.nextColor = b;
+				c.nextColor = b_;
-				b.previousColor = c;
+				b_.previousColor = c;
 				
-				b.nextColor = d;
+				b_.nextColor = d;
-				d.previousColor = b;
+				d.previousColor = b_;
 			}
 		}
 		getMaxColors(n){
-			var n = Math.min(n, this.numberOfColors);
+			n = Math.min(n, this.numberOfColors);
 			var colors = Object.create(null);
 			var current = this.maxBoundary;
 			for (;n && current;n -= 1){
@@ -76,5 +75,5 @@
 			);
 		}
 		return statistic;
-	}
+	};
 }());

lib/defaultSettings.js

@@ -1,6 +1,4 @@
-"use strict";
+const settings = {
-
-var settings = {
 	logLevel: 1,
 	whiteList: "",
 	blackList: "",

lib/frame.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -136,7 +135,7 @@
 		
 		interceptedWindows.set(window, true);
 		return true;
-	};
+	}
 	
 	if (settings.isStillDefault){
 		message("load settings");

lib/intercept.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

lib/lists.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -21,8 +20,6 @@
 	
 	
 	function getDomainRegExpList(domainList){
-		"use strict";
-		
 		var list = domainList
 			.split(",")
 			.map(function(entry){
@@ -35,7 +32,7 @@
 				var regExp;
 				var domain = !!entry.match(/^[\w.]+$/);
 				if (domain){
-					regExp = new RegExp("(?:^|\\.)" + entry.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "\\.?$", "i");
+					regExp = new RegExp("(?:^|\\.)" + entry.replace(/([\\+*?[^\]$(){}=!|.])/g, "\\$1") + "\\.?$", "i");
 				}
 				else {
 					regExp = new RegExp(entry, "i");
@@ -68,15 +65,12 @@
 	};
 
 	function updateList(type, value){
-		"use strict";
 		if (typeof value === "undefined"){
 			value = prefs[type + "List"];
 		}
 		lists[type] = getDomainRegExpList(value);
 	}
 	Object.keys(lists).forEach(function(type){
-		"use strict";
-		
 		preferences.on(type + "List", function(value){
 			updateList(type, value);
 		});
@@ -111,13 +105,9 @@
 	updateStackList(prefs.stackList);
 
 	scope.get = function getList(type){
-		"use strict";
-		
 		return lists[type];
 	};
 	scope.appendTo = function appendToList(type, entry){
-		"use strict";
-		
 		prefs[type + "List"] += (prefs[type + "List"]? ",": "") + entry;
 		var obj = {};
 		obj[type + "List"] = prefs[type + "List"];

lib/logging.js

@@ -1,4 +1,4 @@
-/* jslint moz: true */
+/* eslint no-console: off */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -47,7 +47,7 @@
 					leftPad(date.getMinutes(), "0", 2) + ":" +
 					leftPad(date.getSeconds(), "0", 2) + "." +
 					leftPad(date.getMilliseconds(), "0", 3) +
-					"]"
+					"]";
 				if (typeof args[0] === "string"){
 					args[0] = pre + " " + args[0];
 				}

lib/main.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -32,13 +31,17 @@
 				if (
 					Array.isArray(value) &&
 					value.length === 128 &&
-					value.every(function(value){return typeof value === "number" && value >= 0 && value < 256;})
+					value.every(function(value){
+						return typeof value === "number" && value >= 0 && value < 256;
+					})
 				){
 					persistentRnd[domain] = value;
 				}
 			}
 		}
-		catch(e){}
+		catch(e){
+			// JSON is not valid -> ignore it
+		}
 		
 		function updateContentScripts(){
 			message("update content scripts");
@@ -101,7 +104,7 @@
 					){
 						browser.pageAction.show(port.sender.tab.id);
 					}
-				})
+				});
 				verbose("got data", data, "from port", port);
 			});
 		});

lib/modifiedAPI.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -18,8 +17,6 @@
 	const logging = require("./logging");
 	const {copyCanvasToWebgl} = require("./webgl");
 	
-	// let Cu = require("chrome").Cu;
-	
 	var randomSupply = null;
 	
 	function getContext(window, canvas){
@@ -134,7 +131,7 @@
 			return size > minSize & size <= maxSize;
 		}
 		else {
-			return true
+			return true;
 		}
 	}
 	
@@ -156,7 +153,7 @@
 						mode: "allow",
 						type: status.type,
 						active: false
-					}
+					};
 				}
 				else if (hasType(status, "context") || hasType(status, "input")){
 					return {
@@ -166,7 +163,7 @@
 					};
 				}
 				else {
-					var status = Object.create(status);
+					status = Object.create(status);
 					status.active = false;
 					return status;
 				}
@@ -182,7 +179,7 @@
 		toDataURL: {
 			type: "readout",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				if (hasType(status, "input")){
 					var contextType = canvasContextType.get(obj);
 					status.active = contextType !== "2d";
@@ -208,7 +205,7 @@
 		toBlob: {
 			type: "readout",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				if (hasType(status, "input")){
 					var contextType = canvasContextType.get(obj);
 					status.active = contextType !== "2d";
@@ -235,7 +232,7 @@
 		mozGetAsFile: {
 			type: "readout",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				if (hasType(status, "input")){
 					var contextType = canvasContextType.get(obj);
 					status.active = contextType !== "2d";
@@ -261,7 +258,7 @@
 		getImageData: {
 			type: "readout",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				if (hasType(status, "input")){
 					var contextType = canvasContextType.get(obj && obj.canvas);
 					status.active = contextType !== "2d";
@@ -298,7 +295,7 @@
 		fillText: {
 			type: "input",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				status.active = hasType(status, "input");
 				return status;
 			},
@@ -312,7 +309,9 @@
 							// "this" is not trustable - it may be not a context
 							oldImageData = getImageData(window, this).imageData;
 						}
-						catch (e){}
+						catch (e){
+							// nothing to do here
+						}
 						// if "this" is not a correct context the next line will throw an error
 						var ret = original.apply(this, window.Array.from(arguments));
 						var newImageData = getImageData(window, this).imageData;
@@ -328,7 +327,7 @@
 		strokeText: {
 			type: "input",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				status.active = hasType(status, "input");
 				return status;
 			},
@@ -342,7 +341,9 @@
 							// "this" is not trustable - it may be not a context
 							oldImageData = getImageData(window, this).imageData;
 						}
-						catch (e){}
+						catch (e){
+							// nothing to do here
+						}
 						// if "this" is not a correct context the next line will throw an error
 						var ret = original.apply(this, window.Array.from(arguments));
 						var newImageData = getImageData(window, this).imageData;
@@ -358,7 +359,7 @@
 		readPixels: {
 			type: "readout",
 			getStatus: function(obj, status){
-				var status = Object.create(status);
+				status = Object.create(status);
 				status.active = hasType(status, "readout") || hasType(status, "input");
 				return status;
 			},

lib/randomSupplies.js

@@ -1,4 +1,3 @@
-/* jslint moz: true, bitwise: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -48,7 +47,7 @@
 				browser.runtime.sendMessage({"canvasBlocker-new-domain-rnd": {domain, rnd: Array.from(persistentRnd[domain])}});
 			}
 			return persistentRnd[domain];
-		}
+		};
 	}());
 	scope.persistent = {
 		name: "persistent",
@@ -88,7 +87,7 @@
 					rng(b, baseIndex + 2),
 					rng(a, baseIndex + 3)
 				];
-			}
+			};
 		}
 	};
 	
@@ -160,7 +159,7 @@
 					rng(b, baseIndex + 2),
 					rng(a, baseIndex + 3)
 				];
-			}
+			};
 		}
 	};
 }());

lib/require.js

@@ -1,5 +1,11 @@
+/* global settings exportFunction */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
 window.scope = {};
 function require(module){
+	"use strict";
 	if (module.startsWith("./")){
 		var scopeName = module.substr(2).replace(/\..+/, "");
 		return window.scope[scopeName];
@@ -21,22 +27,21 @@ function require(module){
 					}
 				});
 			}
-		}
+		};
 	}
 	else if (module === "sdk/l10n"){
 		return {
 			get: function(key){
 				return browser.i18n.getMessage(key);
 			}
-		}
+		};
 	}
 	else if (module === "sdk/url"){
 		return {
 			URL
+		};
 	}
-	}
+	throw new ReferenceError("Unable to get non relative module " + module + "!");
-	console.error("Not able to get non relative modules!", module);
-	return undefined;
 }
 
 window.scope.require = require;

lib/webgl.js

@@ -1,4 +1,3 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -44,8 +43,8 @@
 		}
 		context.attachShader(program, shader);
 		
-		var shader = context.createShader(context.FRAGMENT_SHADER);
+		shader = context.createShader(context.FRAGMENT_SHADER);
-		var fragmenter = "precision mediump float;\nuniform sampler2D u_image;\nvarying vec2 v_texCoord;\nvoid main(){\n\tgl_FragColor = texture2D(u_image, v_texCoord);\n}"
+		var fragmenter = "precision mediump float;\nuniform sampler2D u_image;\nvarying vec2 v_texCoord;\nvoid main(){\n\tgl_FragColor = texture2D(u_image, v_texCoord);\n}";
 		context.shaderSource(shader, fragmenter);
 		context.compileShader(shader);
 		success = context.getShaderParameter(shader, context.COMPILE_STATUS);
@@ -112,9 +111,9 @@
 		context.texImage2D(context.TEXTURE_2D, 0, context.RGBA, context.RGBA, context.UNSIGNED_BYTE, canvas);
 
 		var primitiveType = context.TRIANGLES;
-		var offset = 0;
+		var triangleOffset = 0;
 		var count = 6;
-		context.drawArrays(primitiveType, offset, count);
+		context.drawArrays(primitiveType, triangleOffset, count);
 		
 		return {webGlCanvas, context};
 	};

options/buildPrefInputs.js

@@ -1,3 +1,11 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+(function(){
+	"use strict";
+
+	const logging = require("./logging");
+
 	var table = document.createElement("table");
 	table.className = "settings";
 	document.body.appendChild(table);
@@ -308,32 +316,32 @@ document.body.appendChild(table);
 			}
 		}
 	].forEach(function(pref){
-	var html = '<td><div class="content"><span class="title">__MSG_' + pref.name + '_title__</span><div class="description">__MSG_' + pref.name + '_description__</div></div></td><td><div class="content">';
+		var html = "<td><div class=\"content\"><span class=\"title\">__MSG_" + pref.name + "_title__</span><div class=\"description\">__MSG_" + pref.name + "_description__</div></div></td><td><div class=\"content\">";
-	var inputAttributes = ' data-storage-name="' + pref.name + '" data-storage-type="' + pref.type + '" class="setting"'
+		var inputAttributes = " data-storage-name=\"" + pref.name + "\" data-storage-type=\"" + pref.type + "\" class=\"setting\"";
 		switch (pref.type){
 			case "integer":
-			html += '<input type="number"' + inputAttributes + ' value="' + pref.value + '">';
+				html += "<input type=\"number\"" + inputAttributes + " value=\"" + pref.value + "\">";
 				break;
 			case "string":
-			html += '<input type="text"' + inputAttributes + ' value="' + pref.value + '">';
+				html += "<input type=\"text\"" + inputAttributes + " value=\"" + pref.value + "\">";
 				break;
 			case "bool":
-			html += '<input type="checkbox" style="display: inline"' + inputAttributes + (pref.value? ' checked="checked"': "") + '>';
+				html += "<input type=\"checkbox\" style=\"display: inline\"" + inputAttributes + (pref.value? " checked=\"checked\"": "") + ">";
 				break;
 			case "menulist":
-			html += '<select' + inputAttributes + 'data-type="' + (typeof pref.value) + '">' +
+				html += "<select" + inputAttributes + "data-type=\"" + (typeof pref.value) + "\">" +
 					pref.options.map(function(option){
 						if (option.value !== ""){
-						return '<option value="' + option.value + '"' + (option.value === pref.value? " selected": "") + '>__MSG_' + pref.name + '_options.' + option.label + '__</option>';
+							return "<option value=\"" + option.value + "\"" + (option.value === pref.value? " selected": "") + ">__MSG_" + pref.name + "_options." + option.label + "__</option>";
 						}
 						else {
-						return '<option disabled>----------------</option>';
+							return "<option disabled>----------------</option>";
 						}
 					}).join("") +
-				'</select>';
+					"</select>";
 				break;
 			case "control":
-			html += '<button' + inputAttributes + '">__MSG_' + pref.name + '_label__</button>';
+				html += "<button" + inputAttributes + "\">__MSG_" + pref.name + "_label__</button>";
 				break;
 			default:
 				logging.warning("Unknown preference type: " + pref.type);
@@ -346,3 +354,4 @@ document.body.appendChild(table);
 		logging.verbose(html);
 		table.appendChild(tr);
 	});
+}());

options/options.html

@@ -7,6 +7,7 @@
 	</head>
 	<body>
 		<script src="../lib/defaultSettings.js"></script>
+        <script src="../lib/require.js"></script>
 		<script src="../lib/logging.js"></script>
 		<script src="buildPrefInputs.js"></script>
 		<script src="options.js"></script>

options/options.js

@@ -1,7 +1,11 @@
-/* jslint moz: true */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+(function(){
+	"use strict";
+
+	const logging = require("./logging");
+
 	browser.storage.local.get().then(function(data){
 		Object.keys(data).forEach(function(key){
 			settings[key] = data[key];
@@ -19,7 +23,7 @@ browser.storage.local.get().then(function(data){
 		// getting the translation of all the messages
 		logging.message("transate all messages");
 		traverse(document.body, function(node){
-		if (node.nodeType == 3){
+			if (node.nodeType === 3){
 				var lines = node.nodeValue.replace(/\b__MSG_(.+)__\b/g, function(m, key){
 					try {
 						return browser.i18n.getMessage(key);
@@ -48,7 +52,8 @@ browser.storage.local.get().then(function(data){
 					var obj = {};
 					obj[storageName] = value;
 					browser.storage.local.set(obj);
-			});}
+				});
+			}
 			else {
 				input.value = settings[storageName];
 				
@@ -128,3 +133,4 @@ browser.storage.local.get().then(function(data){
 			}
 		});
 	});
+}());

test/detectionTest.js

@@ -1,5 +1,7 @@
-
+/* eslint no-console: off */
 var addTest = (function(){
+	"use strict";
+
 	var stati = [
 		{className: "notRun", text: "not run"},
 		{className: "loud", text: "CB detected"},
@@ -34,10 +36,12 @@ var addTest = (function(){
 		statusNode.title = logs.join("\n");
 		li.appendChild(statusNode);
 		ul.appendChild(li);
-	}
+	};
 }());
 
 addTest("function length", function(log){
+	"use strict";
+	
 	if (CanvasRenderingContext2D.prototype.getImageData.length !== 4){
 		log("expected 4 parameters for getImageData - got", CanvasRenderingContext2D.prototype.getImageData.length);
 		return true;
@@ -47,6 +51,8 @@ addTest("function length", function(log){
 	}
 });
 addTest("function code", function(log){
+	"use strict";
+	
 	if (!CanvasRenderingContext2D.prototype.getImageData.toString().match(/^\s*function getImageData\s*\(\)\s*\{\s*\[native code\]\s*\}\s*$/)){
 		log("unexpected function code:", CanvasRenderingContext2D.prototype.getImageData.toString());
 		return true;
@@ -55,9 +61,15 @@ addTest("function code", function(log){
 		return false;
 	}
 });
-addTest("function name", function(){return CanvasRenderingContext2D.prototype.getImageData.name !== "getImageData"});
+addTest("function name", function(){
+	"use strict";
+	
+	return CanvasRenderingContext2D.prototype.getImageData.name !== "getImageData";
+});
 addTest("error provocation 1", function(log){
-	var canvas = document.createElement('canvas');
+	"use strict";
+	
+	var canvas = document.createElement("canvas");
 	var ctx = canvas.getContext("2d");
 	var canvasBlocker = false;
 	try{
@@ -75,7 +87,9 @@ addTest("error provocation 1", function(log){
 	return canvasBlocker;
 });
 addTest("error provocation 2", function(log){
-	var canvas = document.createElement('canvas');
+	"use strict";
+	
+	var canvas = document.createElement("canvas");
 	canvas.width = 0;
 	var ctx = canvas.getContext("2d");
 	var canvasBlocker = false;
@@ -95,6 +109,8 @@ addTest("error provocation 2", function(log){
 	return canvasBlocker;
 });
 addTest("error provocation 3", function(log){
+	"use strict";
+	
 	var canvasBlocker = false;
 	try{
 		CanvasRenderingContext2D.prototype.getImageData.apply(undefined, [0, 0, 1, 1]);
@@ -111,6 +127,8 @@ addTest("error provocation 3", function(log){
 	return canvasBlocker;
 });
 function testKnownPixelValue(size, log){
+	"use strict";
+	
 	var canvas = document.createElement("canvas");
 	canvas.height = size;
 	canvas.width = size;
@@ -128,16 +146,22 @@ function testKnownPixelValue(size, log){
 	return false;
 }
 addTest("known pixel value test 1", function(log){
+	"use strict";
+	
 	return testKnownPixelValue(1, log);
 });
 addTest("known pixel value test 10", function(log){
+	"use strict";
+	
 	return testKnownPixelValue(10, log);
 });
 addTest("double readout test", function(log){
+	"use strict";
+	
 	var canvas = document.createElement("canvas");
 	var context = canvas.getContext("2d");
 	var imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-	for (var i = 0; i < imageData.data.length; i += 1){
+	for (let i = 0; i < imageData.data.length; i += 1){
 		if (i % 4 !== 3){
 			imageData.data[i] = Math.floor(256 * Math.random());
 		}
@@ -149,7 +173,7 @@ addTest("double readout test", function(log){
 	
 	var imageData1 = context.getImageData(0, 0, canvas.width, canvas.height);
 	var imageData2 = context.getImageData(0, 0, canvas.width, canvas.height);
-	for (var i = 0; i < imageData2.data.length; i += 1){
+	for (let i = 0; i < imageData2.data.length; i += 1){
 		if (imageData1.data[i] !== imageData2.data[i]){
 			log("mismatch at", i, ":",
 				imageData1.data[i], "(", imageData1.data[i].toString(2), ")",
@@ -163,10 +187,12 @@ addTest("double readout test", function(log){
 	return false;
 });
 addTest("readout - in - out test", function(log){
+	"use strict";
+	
 	var canvas = document.createElement("canvas");
 	var context = canvas.getContext("2d");
 	var imageData = context.getImageData(0, 0, canvas.width, canvas.height);
-	for (var i = 0; i < imageData.data.length; i += 1){
+	for (let i = 0; i < imageData.data.length; i += 1){
 		if (i % 4 !== 3){
 			imageData.data[i] = Math.floor(256 * Math.random());
 		}
@@ -181,7 +207,7 @@ addTest("readout - in - out test", function(log){
 	var context2 = canvas2.getContext("2d");
 	context2.putImageData(imageData1, 0, 0);
 	var imageData2 = context2.getImageData(0, 0, canvas.width, canvas.height);
-	for (var i = 0; i < imageData2.data.length; i += 1){
+	for (let i = 0; i < imageData2.data.length; i += 1){
 		if (imageData1.data[i] !== imageData2.data[i]){
 			log("mismatch at", i, ":",
 				imageData1.data[i], "(", imageData1.data[i].toString(2), ")",

test/firstPossibleCall.js

@@ -1 +1,2 @@
+/* eslint no-console: off */
 console.log("first possible call");

test/performanceTest.js

@@ -1,5 +1,7 @@
 
 var createLog = function(){
+	"use strict";
+	
 	var div = document.getElementById("log");
 	
 	return function createLog(){
@@ -19,6 +21,8 @@ var createLog = function(){
 }();
 
 var performTest = function(){
+	"use strict";
+	
 	return function performTest(name, func, innerRunLength, outerRunLength){
 		var log = createLog();
 		log("test " + name);
@@ -59,12 +63,14 @@ var performTest = function(){
 }();
 
 function draw(canvas){
+	"use strict";
+	
 	canvas.setAttribute("width", 220);
 	canvas.setAttribute("height", 30);
 	
 	var fp_text = "BrowserLeaks,com <canvas> 10";
 	
-	var ctx = canvas.getContext('2d');
+	var ctx = canvas.getContext("2d");
 	ctx.textBaseline = "top";
 	ctx.font = "14px 'Arial'";
 	ctx.textBaseline = "alphabetic";
@@ -79,11 +85,13 @@ function draw(canvas){
 }
 
 var fingerprintTest = function(){
+	"use strict";
+	
 	var canvas;
 	return {
 		prepare: function(){
 			// create window canvas
-			canvas = document.createElement('canvas');
+			canvas = document.createElement("canvas");
 			// draw image in window canvas
 			draw(canvas);
 		},
@@ -94,6 +102,8 @@ var fingerprintTest = function(){
 }();
 
 var randomImageTest = function(){
+	"use strict";
+	
 	var canvas;
 	
 	return {

test/test.js

@@ -1,5 +1,7 @@
 
 (function(){
+	"use strict";
+	
 	function show(container, url){
 		container.querySelector(".display").src = url;
 		var buffer = new TextEncoder("utf-8").encode(url);
@@ -23,12 +25,14 @@
 }());
 
 function draw(canvas){
+	"use strict";
+	
 	canvas.setAttribute("width", 220);
 	canvas.setAttribute("height", 30);
 	
 	var fp_text = "BrowserLeaks,com <canvas> 10";
 	
-	var ctx = canvas.getContext('2d');
+	var ctx = canvas.getContext("2d");
 	ctx.textBaseline = "top";
 	ctx.font = "14px 'Arial'";
 	ctx.textBaseline = "alphabetic";
@@ -43,26 +47,29 @@ function draw(canvas){
 }
 
 function topTest(){
+	"use strict";
+	
 	// create window canvas
-	var canvas = document.createElement('canvas');
+	var canvas = document.createElement("canvas");
 	// draw image in window canvas
 	draw(canvas);
 	return canvas.toDataURL();
 }
 
 function iframeTest(){
+	"use strict";
 
 	// create window canvas
-	var canvas = document.createElement('canvas');
+	var canvas = document.createElement("canvas");
 
 	// draw image in window canvas
 	draw(canvas);
 
 	// create iframe canvas and ctx
-	var iframe_canvas = document.querySelector("#iframe iframe").contentDocument.createElement('canvas');
+	var iframe_canvas = document.querySelector("#iframe iframe").contentDocument.createElement("canvas");
 	iframe_canvas.setAttribute("width", 220);
 	iframe_canvas.setAttribute("height", 30);
-	var iframe_ctx = iframe_canvas.getContext('2d');
+	var iframe_ctx = iframe_canvas.getContext("2d");
 
 	// copy image from window canvas to iframe ctx
 	iframe_ctx.drawImage(canvas, 0, 0);

test/webGL-Test.js

@@ -1,8 +1,10 @@
 (function(){
-	var canvas = document.createElement('canvas');
+	"use strict";
+	
+	var canvas = document.createElement("canvas");
 	canvas.width = 11;
 	canvas.height = 13;
-	var gl = canvas.getContext('webgl');
+	var gl = canvas.getContext("webgl");
 	
 	// paint it completely black
 	gl.clearColor(0, 0, 0, 1);