diff --git a/.eslintrc.json b/.eslintrc.json index aafea81..49bf150 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -17,19 +17,24 @@ "settings": false }, "rules": { - "brace-style": ["warn", "stroustrup", {"allowSingleLine": true}], - "eqeqeq": "warn", + "brace-style": ["error", "stroustrup", {"allowSingleLine": true}], + "comma-spacing": ["error", { "before": false, "after": true }], + "constructor-super": "warn", + "eqeqeq": "error", + "max-len": ["warn", 120], + "max-lines": ["warn", 200], "no-const-assign": "warn", "no-this-before-super": "warn", - "no-undef": "warn", + "no-undef": "error", "no-unreachable": "warn", "no-unused-vars": "off", - "no-trailing-spaces": ["warn", {"skipBlankLines": true}], - "no-mixed-spaces-and-tabs": ["warn", "smart-tabs"], - "constructor-super": "warn", + "no-trailing-spaces": ["error", {"skipBlankLines": true}], + "no-mixed-spaces-and-tabs": ["error", "smart-tabs"], + "indent": ["error", "tab", {"SwitchCase": 1}], + "space-in-parens": ["error", "never"], "valid-typeof": "warn", "quotes": ["error", "double"], "semi": ["error", "always"], - "strict": ["warn", "function"] + "strict": ["error", "function"] } } \ No newline at end of file diff --git a/lib/check.js b/lib/check.js index 8b032d4..a9a1c68 100644 --- a/lib/check.js +++ b/lib/check.js @@ -20,7 +20,9 @@ const logging = require("./logging"); scope.check = function check({url, errorStack}){ - var match = checkBoth(errorStack, url, prefs.blockMode).match(/^(block|allow|fake|ask)(|Readout|Everything|Context|Input|Internal)$/); + var match = checkBoth(errorStack, url, prefs.blockMode).match( + /^(block|allow|fake|ask)(|Readout|Everything|Context|Input|Internal)$/ + ); if (match){ return { type: (match[2] === "Everything" || match[2] === "")? diff --git a/lib/intercept.js b/lib/intercept.js index a474ef6..726db2e 100644 --- a/lib/intercept.js +++ b/lib/intercept.js @@ -60,7 +60,11 @@ apiNames.forEach(function(name){ var changedFunction = changedFunctions[name]; if (changedFunction.getStatus(undefined, siteStatus).active){ - (Array.isArray(changedFunction.object)? changedFunction.object: [changedFunction.object]).forEach(function(object){ + ( + Array.isArray(changedFunction.object)? + changedFunction.object: + [changedFunction.object] + ).forEach(function(object){ var constructor = window.wrappedJSObject[object]; if (constructor){ var original = constructor.prototype[name]; @@ -84,7 +88,12 @@ if (funcStatus.active){ if (funcStatus.mode === "ask"){ - funcStatus.mode = ask({window: window, type: changedFunction.type, canvas: this, errorStack: error.stack}); + funcStatus.mode = ask({ + window: window, + type: changedFunction.type, + canvas: this, + errorStack: error.stack + }); } switch (funcStatus.mode){ case "allow": @@ -95,22 +104,22 @@ notify({ url, errorStack: error.stack, - messageId, timestamp: new Date(), + messageId, + timestamp: new Date(), functionName: name, dataURL: prefs("storeImageForInspection") && - prefs("showNotifications") - ? - ( - this instanceof HTMLCanvasElement? - this.toDataURL(): + prefs("showNotifications")? ( - this.canvas instanceof HTMLCanvasElement? - this.canvas.toDataURL(): - false - ) - ): - false + this instanceof HTMLCanvasElement? + this.toDataURL(): + ( + this.canvas instanceof HTMLCanvasElement? + this.canvas.toDataURL(): + false + ) + ): + false }); }, window, original); switch (fake){ diff --git a/lib/lists.js b/lib/lists.js index 2acc29e..9c98183 100644 --- a/lib/lists.js +++ b/lib/lists.js @@ -49,13 +49,13 @@ }; }); - list.match = function(url){ - return this.some(function(entry){ - return entry.match(url); - }); - }; - - return list; + list.match = function(url){ + return this.some(function(entry){ + return entry.match(url); + }); + }; + + return list; } var lists = { diff --git a/lib/logging.js b/lib/logging.js index cdceaa9..6295ac5 100644 --- a/lib/logging.js +++ b/lib/logging.js @@ -59,10 +59,10 @@ } } - function error (...args){performLog( 1, args);} - function warning(...args){performLog( 25, args);} - function message(...args){performLog( 50, args);} - function notice (...args){performLog( 75, args);} + function error (...args){performLog(1, args);} + function warning(...args){performLog(25, args);} + function message(...args){performLog(50, args);} + function notice (...args){performLog(75, args);} function verbose(...args){performLog(100, args);} function metaLog(...args){performLog(999, args);} diff --git a/lib/main.js b/lib/main.js index 848b79a..b909bc0 100644 --- a/lib/main.js +++ b/lib/main.js @@ -147,7 +147,7 @@ // old code // const {when: unload} = require("sdk/system/unload"); // unload(function(){ - // processes.port.emit("canvasBlocker-unload"); + // processes.port.emit("canvasBlocker-unload"); // }); browser.runtime.onInstalled.addListener(function(){ diff --git a/lib/webgl.js b/lib/webgl.js index 18583ad..808058f 100644 --- a/lib/webgl.js +++ b/lib/webgl.js @@ -69,12 +69,12 @@ var positionBuffer = context.createBuffer(); context.bindBuffer(context.ARRAY_BUFFER, positionBuffer); context.bufferData(context.ARRAY_BUFFER, new Float32Array([ - -1,-1, - -1, 1, - 1,-1, - 1, 1, - -1, 1, - 1,-1 + -1, -1, + -1, 1, + 1, -1, + 1, 1, + -1, 1, + 1, -1 ]), context.STATIC_DRAW); @@ -84,7 +84,7 @@ var normalize = false; // don't normalize the data var stride = 0; // 0 = move forward size * sizeof(type) each iteration to get the next position var offset = 0; // start at the beginning of the buffer - context.vertexAttribPointer( positionAttributeLocation, size, type, normalize, stride, offset); + context.vertexAttribPointer(positionAttributeLocation, size, type, normalize, stride, offset); var texCoordLocation = context.getAttribLocation(program, "a_texCoord"); diff --git a/options/buildPrefInputs.js b/options/buildPrefInputs.js index 909fded..345b3db 100644 --- a/options/buildPrefInputs.js +++ b/options/buildPrefInputs.js @@ -208,15 +208,6 @@ "displayAdvancedSettings": [true] } }, - // { - // "name": "notificationDisplayTime", - // "title": "notification display time", - // "type": "integer", - // "value": 30, - // "displayDependencies": { - // "blockMode": ["fakeReadout", "fakeInput"] - // } - // }, { "name": "ignoreList", "title": "Ignore list", @@ -253,7 +244,8 @@ "displayAdvancedSettings": [true] } ] - },{ + }, + { "name": "enableStackList", "title": "Use file specific scoped white list", "type": "bool", @@ -316,8 +308,14 @@ } } ].forEach(function(pref){ - var html = "
__MSG_" + pref.name + "_title__
__MSG_" + pref.name + "_description__
"; - var inputAttributes = " data-storage-name=\"" + pref.name + "\" data-storage-type=\"" + pref.type + "\" class=\"setting\""; + var html = "
" + + "__MSG_" + pref.name + "_title__" + + "
__MSG_" + pref.name + "_description__
" + + "
"; + var inputAttributes = + " data-storage-name=\"" + pref.name + "\"" + + " data-storage-type=\"" + pref.type + "\"" + + " class=\"setting\""; switch (pref.type){ case "integer": html += ""; @@ -326,13 +324,20 @@ html += ""; break; case "bool": - html += ""; + html += ""; break; case "menulist": html += "" + pref.options.map(function(option){ if (option.value !== ""){ - return ""; + return ""; } else { return ""; diff --git a/options/options.js b/options/options.js index cf7d586..790c817 100644 --- a/options/options.js +++ b/options/options.js @@ -74,11 +74,6 @@ showReleaseNotes: function(){ logging.verbose("open release notes"); window.open("../releaseNotes.txt", "_blank"); - // would be nicer but is not supported in fennec - // browser.windows.create({ - // url: "../releaseNotes.txt", - // type: "popup" - // }); }, clearPersistentRnd: function(){ logging.message("clear persistent rnd storage"); @@ -104,7 +99,11 @@ var displayDependencies = row.setting.displayDependencies; if (displayDependencies){ row.classList[( - (Array.isArray(displayDependencies)? displayDependencies: [displayDependencies]).some(function(displayDependency){ + ( + Array.isArray(displayDependencies)? + displayDependencies: + [displayDependencies] + ).some(function(displayDependency){ return Object.keys(displayDependency).every(function(key){ return displayDependency[key].indexOf(settings[key]) !== -1; });