Skip to content

Commit

Permalink
jshint master
Browse files Browse the repository at this point in the history
  • Loading branch information
hthetiot committed Sep 25, 2018
1 parent 00c4cdf commit d200a8d
Show file tree
Hide file tree
Showing 17 changed files with 6,609 additions and 201 deletions.
9 changes: 8 additions & 1 deletion .jshintignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
node_modules
node_modules/*
bower_components/*
test/api/bower_components/*
server_example/node_modules/*
test/reports/*
docs/*
dev/*
demos/js/prettify
api/easyrtc.js
126 changes: 7 additions & 119 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -1,122 +1,10 @@
{
// --------------------------------------------------------------------
// JSHint Configuration, Strict Edition
// --------------------------------------------------------------------
//
// This is a options template for [JSHint][1], using [JSHint example][2]
// and [Ory Band's example][3] as basis and setting config values to
// be most strict:
//
// * set all enforcing options to true
// * set all relaxing options to false
// * set all environment options to false, except the browser value
// * set all JSLint legacy options to false
//
// [1]: http://www.jshint.com/
// [2]: https://github.com/jshint/node-jshint/blob/master/example/config.json
// [3]: https://github.com/oryband/dotfiles/blob/master/jshintrc
//
// @author http://michael.haschke.biz/
// @license http://unlicense.org/

// == Enforcing Options ===============================================
//
// These options tell JSHint to be more strict towards your code. Use
// them if you want to allow only a safe subset of JavaScript, very
// useful when your codebase is shared with a big number of developers
// with different skill levels.

"bitwise" : false, // Prohibit bitwise operators (&, |, ^, etc.).
"curly" : true, // Require {} for every new block or scope.
"eqeqeq" : true, // Require triple equals i.e. `===`.
"forin" : true, // Tolerate `for in` loops without `hasOwnPrototype`.
"immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
"latedef" : true, // Prohibit variable use before definition.
"newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`.
"noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`.
"noempty" : true, // Prohibit use of empty blocks.
"nonew" : true, // Prohibit use of constructors for side-effects.
"plusplus" : false, // Prohibit use of `++` & `--`.
"regexp" : true, // Prohibit `.` and `[^...]` in regular expressions.
"undef" : true, // Require all non-global variables be declared before they are used.
"strict" : false, // Require `use strict` pragma in every file.
"trailing" : true, // Prohibit trailing whitespaces.

// == Relaxing Options ================================================
//
// These options allow you to suppress certain types of warnings. Use
// them only if you are absolutely positive that you know what you are
// doing.

"asi" : false, // Tolerate Automatic Semicolon Insertion (no semicolons).
"boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments.
"debug" : false, // Allow debugger statements e.g. browser breakpoints.
"eqnull" : false, // Tolerate use of `== null`.
"es5" : false, // Allow EcmaScript 5 syntax.
"esnext" : false, // Allow ES.next specific features such as `const` and `let`.
"evil" : false, // Tolerate use of `eval`.
"expr" : false, // Tolerate `ExpressionStatement` as Programs.
"funcscope" : false, // Tolerate declarations of variables inside of control structures while accessing them later from the outside.
"globalstrict" : true, // Allow global "use strict" (also enables 'strict').
"iterator" : false, // Allow usage of __iterator__ property.
"lastsemic" : false, // Tolerat missing semicolons when the it is omitted for the last statement in a one-line block.
"laxbreak" : false, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons.
"laxcomma" : false, // Suppress warnings about comma-first coding style.
"loopfunc" : false, // Allow functions to be defined within loops.
"multistr" : false, // Tolerate multi-line strings.
"onecase" : false, // Tolerate switches with just one case.
"proto" : false, // Tolerate __proto__ property. This property is deprecated.
"regexdash" : false, // Tolerate unescaped last dash i.e. `[-...]`.
"scripturl" : false, // Tolerate script-targeted URLs.
"smarttabs" : false, // Tolerate mixed tabs and spaces when the latter are used for alignmnent only.
"shadow" : false, // Allows re-define variables later in code e.g. `var x=1; x=2;`.
"sub" : true, // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`.
"supernew" : false, // Tolerate `new function () { ... };` and `new Object;`.
"validthis" : false, // Tolerate strict violations when the code is running in strict mode and you use this in a non-constructor function.

// == Environments ====================================================
//
// These options pre-define global variables that are exposed by
// popular JavaScript libraries and runtime environments—such as
// browser or node.js.

"browser" : true, // Standard browser globals e.g. `window`, `document`.
"couch" : false, // Enable globals exposed by CouchDB.
"devel" : false, // Allow development statements e.g. `console.log();`.
"dojo" : false, // Enable globals exposed by Dojo Toolkit.
"jquery" : false, // Enable globals exposed by jQuery JavaScript library.
"mootools" : false, // Enable globals exposed by MooTools JavaScript framework.
"node" : false, // Enable globals available when code is running inside of the NodeJS runtime environment.
"nonstandard" : false, // Define non-standard but widely adopted globals such as escape and unescape.
"prototypejs" : false, // Enable globals exposed by Prototype JavaScript framework.
"rhino" : false, // Enable globals available when your code is running inside of the Rhino runtime environment.
"wsh" : false, // Enable globals available when your code is running as a script for the Windows Script Host.

// == JSLint Legacy ===================================================
//
// These options are legacy from JSLint. Aside from bug fixes they will
// not be improved in any way and might be removed at any point.

"nomen" : false, // Prohibit use of initial or trailing underbars in names.
"onevar" : false, // Allow only one `var` statement per function.
"passfail" : false, // Stop on first error.
"white" : false, // Check against strict whitespace and indentation rules.

// == Undocumented Options ============================================
//
// While I've found these options in [example1][2] and [example2][3]
// they are not described in the [JSHint Options documentation][4].
//
// [4]: http://www.jshint.com/options/

"maxerr" : 100, // Maximum errors before stopping.
"predef" : [ // Extra globals.
//"exampleVar",
//"anotherCoolGlobal",
//"iLoveDouglas"
],
"indent" : 4, // Specify indentation spacing
"globals" : {
"getUserMedia": true
"esversion": 6,
"asi" : true,
"loopfunc": true,
"globals": {
"console": true,
"easyrtc": true,
"RTCPeerConnection": true
}
}
2 changes: 1 addition & 1 deletion api/easyrtc_ft.js
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ easyrtc_ft.saveAs = (function() {
*/

/*global self */
/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
/*jslint bitwise: true, regexp: true, confusion: true, vars: true, white: true,
plusplus: true */

/*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js */
Expand Down
4 changes: 2 additions & 2 deletions api/easyrtc_int.js
Original file line number Diff line number Diff line change
Expand Up @@ -1259,8 +1259,8 @@ var Easyrtc = function() {
});
}

if( activeId ) {
items["firefoxRemoteAddress"] = candidates[activeId];
if (activeId) {
items.firefoxRemoteAddress = candidates[activeId];
}
if (!filter) {
callback(peerId, items);
Expand Down
1 change: 1 addition & 0 deletions demos/js/demo_data_channel_filesharing.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ function convertListToButtons(roomName, occupants, isPrimary) {
break;
case "started_file":
statusDiv.innerHTML = "started file: " + state.name;
break;
case "working":
statusDiv.innerHTML = state.name + ":" + state.position + "/" + state.size + "(" + state.numFiles + " files)";
break;
Expand Down
12 changes: 6 additions & 6 deletions demos/js/demo_instant_messaging_rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ function addQuickJoinButtons(roomList) {
quickJoinBlock.appendChild(div);

}
if( !roomList["room1"]) {
roomList["room1"] = { numberClients:0};
if( !roomList.room1) {
roomList.room1 = { numberClients:0};
}
if( !roomList["room2"]) {
roomList["room2"] = { numberClients:0};
if( !roomList.room2) {
roomList.room2 = { numberClients:0};
}
if( !roomList["room3"]) {
roomList["room3"] = { numberClients:0};
if( !roomList.room3) {
roomList.room3 = { numberClients:0};
}
for (var roomName in roomList) {
addQuickJoinButton(roomName, roomList[roomName].numberClients);
Expand Down
21 changes: 11 additions & 10 deletions demos/js/demo_multiparty.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ var reshapeThumbs = [
else {
return reshape3of3(parentw, parenth);
}
/* falls through */
case 3:
return reshape3of4(parentw, parenth);
}
Expand Down Expand Up @@ -362,10 +363,10 @@ function killButtonReshaper(parentw, parenth) {
var imagew = 128;
var imageh = 128;
if( parentw < parenth) {
return setThumbSizeButton(0.1, -.51, -0.01, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.1, -0.51, -0.01, parentw, parenth, imagew, imageh);
}
else {
return setThumbSizeButton(0.1, -.01, -.51, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.1, -0.01, -0.51, parentw, parenth, imagew, imageh);
}
}

Expand All @@ -374,21 +375,21 @@ function muteButtonReshaper(parentw, parenth) {
var imagew = 32;
var imageh = 32;
if( parentw < parenth) {
return setThumbSizeButton(0.10, -.51, 0.01, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.10, -0.51, 0.01, parentw, parenth, imagew, imageh);
}
else {
return setThumbSizeButton(0.10, 0.01, -.51, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.10, 0.01, -0.51, parentw, parenth, imagew, imageh);
}
}

function reshapeTextEntryButton(parentw, parenth) {
var imagew = 32;
var imageh = 32;
if( parentw < parenth) {
return setThumbSizeButton(0.10, .51, 0.01, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.10, 0.51, 0.01, parentw, parenth, imagew, imageh);
}
else {
return setThumbSizeButton(0.10, 0.01, .51, parentw, parenth, imagew, imageh);
return setThumbSizeButton(0.10, 0.01, 0.51, parentw, parenth, imagew, imageh);
}
}

Expand Down Expand Up @@ -598,8 +599,8 @@ function showMessage(startX, startY, content) {
var fullPage = document.getElementById('fullpage');
var fullW = parseInt(fullPage.offsetWidth);
var fullH = parseInt(fullPage.offsetHeight);
var centerEndX = .2*startX + .8*fullW/2;
var centerEndY = .2*startY + .8*fullH/2;
var centerEndX = 0.2*startX + 0.8*fullW/2;
var centerEndY = 0.2*startY + 0.8*fullH/2;


var cloudObject = document.createElement("img");
Expand Down Expand Up @@ -637,8 +638,8 @@ function showMessage(startX, startY, content) {
textObject.style.left = Math.floor(centerEndX-fullW/8) + "px";
textObject.style.top = Math.floor(centerEndY) + "px";
textObject.style.fontSize = "36pt";
textObject.style.width = (fullW*.4) + "px";
textObject.style.height = (fullH*.4) + "px";
textObject.style.width = (fullW*0.4) + "px";
textObject.style.height = (fullH*0.4) + "px";
textObject.style.zIndex = 6;
textObject.appendChild( document.createTextNode(content));
fullPage.appendChild(textObject);
Expand Down
5 changes: 2 additions & 3 deletions demos/js/demo_multistream_no_iframe.js
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,8 @@ var mypluginId = "tawk-desktop-capture/bemabaogbdfpbkkganibcmhbgjogabfj";

setTimeout(
function() {
document.getElementById("pluginstatus").innerHTML = easyrtc.isDesktopCaptureInstalled()
?"Desktop capture ready"
:"Desktop capture not installed";
document.getElementById("pluginstatus").innerHTML = easyrtc.isDesktopCaptureInstalled() ?
"Desktop capture ready" : "Desktop capture not installed";
}, 3000);

document.getElementById("installPluginButton").onclick = function() {
Expand Down
9 changes: 6 additions & 3 deletions lib/easyrtc_public_obj.js
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,17 @@ pub.util.log = function(level, logText, logFields) {
if (level !== "error") {
break;
}
/* falls through */
case "warning":
if (level === "info") {
break;
}
/* falls through */
case "info":
if (level === "debug") {
break;
}
/* falls through */
case "debug":
pub.events.emit("log", level, logText, logFields);
break;
Expand Down Expand Up @@ -826,8 +829,8 @@ pub.util.isValidIncomingMessage = function(type, msg, appObj, callback) {
}
);

return;
break;
return; /* jshint ignore:line */
break; /* jshint ignore:line */

case "easyrtcCmd":
switch (msg.msgType) {
Expand Down Expand Up @@ -1046,7 +1049,7 @@ pub.util.sendSessionCookie = function(req, res) {
if (!pub.getOption("sessionEnable") || !pub.getOption("sessionCookieEnable")) {
return;
}
if (req.sessionID && (!req.cookies || !req.cookies["easyrtcsid"] || req.cookies["easyrtcsid"] !== req.sessionID)) {
if (req.sessionID && (!req.cookies || !req.cookies.easyrtcsid || req.cookieseasyrtcsid !== req.sessionID)) {
try {
pub.util.logDebug("Sending easyrtcsid cookie [" + req.sessionID + "] to [" + req.ip + "] for request [" + req.url + "]");
res.cookie("easyrtcsid", req.sessionID, {maxAge: 2592000000, httpOnly: false});
Expand Down
Loading

0 comments on commit d200a8d

Please sign in to comment.