Fixed bunch of Javascript syntax issues.

static/js/directives/chat.js

@@ -209,7 +209,7 @@ define(['underscore', 'text!partials/chat.html', 'text!partials/chatroom.html'],
 								mid = randomGen.random({
 									hex: true
 								});
-							};
+							}
 							if (peercall && peercall.peerconnection.datachannelReady) {
 								subscope.p2p(true);
 								// Send out stuff through data channel.

static/js/directives/screenshare.js

@@ -165,7 +165,7 @@ define(['jquery', 'underscore', 'text!partials/screenshare.html', 'text!partials
 
 				if ($scope.layout.screenshare) {
 					$scope.stopScreenshare();
-				};
+				}
 
 				$scope.layout.screenshare = true;
 

static/js/mediastream/utils.js

@@ -26,7 +26,9 @@ define(['jquery', 'underscore'], function($, _) {
 		var merged = cons1;
 		var name;
 		for (name in cons2.mandatory) {
-			merged.mandatory[name] = cons2.mandatory[name];
+			if (cons2.mandatory.hasOwnProperty(name)) {
+				merged.mandatory[name] = cons2.mandatory[name];
+			}
 		}
 		merged.optional.concat(cons2.optional);
 		return merged;

static/js/mediastream/webrtc.js

@@ -32,7 +32,7 @@ define([
 	'mediastream/usermedia',
 	'mediastream/utils',
 	'mediastream/tokens',
-	'webrtc.adapter', ],
+	'webrtc.adapter'],
 
 function($, _, PeerCall, PeerConference, PeerXfer, PeerScreenshare, UserMedia, utils, tokens) {
 

static/js/services/desktopnotify.js

@@ -82,7 +82,7 @@ define(['jquery', 'underscore', 'desktop-notify'], function($, _) {
 
 			if (!this.enabled()) {
 				return this.dummy;
-			};
+			}
 
 			var opts = {
 				body: body,

static/js/services/fastscroll.js

@@ -43,7 +43,7 @@
  */
 define(["jquery"], function($) {
 
-	function dispatchClick(coords) {
+	var dispatchClick = function(coords) {
 		var event = document.createEvent('MouseEvent'),
 			elem = document.elementFromPoint(coords.x, coords.y);
 

static/js/services/filedownload.js

@@ -186,7 +186,7 @@ define(["jquery", "underscore"], function($, _) {
 			var idx = this.jobs.indexOf(job);
 			if (~idx) { // Yay i love fancy code which is hard to understand!
 				this.jobs.splice(idx, 1);
-			};
+			}
 			if (this.chunk >= this.end && this.jobs.length === 0) {
 				//console.log("File done.")
 				safeApply(this.scope, _.bind(function($scope) {

static/js/services/playsound.js

@@ -97,7 +97,7 @@ define(['underscore', 'Howler', 'require'], function(_, Howler, require) {
 
 		if (this.aliases.hasOwnProperty(id)) {
 			return this.aliases[id];
-		};
+		}
 		return id;
 
 	};

static/js/services/randomgen.js

@@ -34,8 +34,7 @@ define(["underscore"], function(_) {
 		};
 
 		// Fast binary to hex function.
-
+		var binStringToHex = function(s) {
-		function binStringToHex(s) {
 			var s2 = '',
 				c;
 			for (var i = 0, l = s.length; i < l; ++i) {