Code refactoring batch vthibault#1

Remove unused variables Add missing semicolons Other code convention
acgfbr · May 7, 2015 · 7061ba5 · 7061ba5
1 parent 2bf6d3f
commit 7061ba5
Show file tree

Hide file tree

Showing 19 changed files with 197 additions and 171 deletions.
diff --git a/api.js b/api.js
@@ -287,9 +287,9 @@
 				frame.height       = this.height;
 				frame.style.border = 'none';
 
-				frame.setAttribute('allowfullscreen', true);
-				frame.setAttribute('webkitallowfullscreen', true);
-				frame.setAttribute('mozallowfullscreen', true);
+				frame.setAttribute('allowfullscreen', 'true');
+				frame.setAttribute('webkitallowfullscreen', 'true');
+				frame.setAttribute('mozallowfullscreen', 'true');
 
 				if (this.target) {
 					while (this.target.firstChild) {

diff --git a/src/Controls/ProcessCommand.js b/src/Controls/ProcessCommand.js
@@ -199,7 +199,7 @@ define(function( require )
 
 		// /str+
 		// TODO: do we have to spam the server with "1" unit or do we have to fix the servers code ?
-		var matches = text.match(/^(\w{3})\+ (\d+)$/);
+		matches = text.match(/^(\w{3})\+ (\d+)$/);
 		if (matches) {
 			var pos = ['str', 'agi', 'vit', 'int', 'dex', 'luk'].indexOf(matches[1]);
 			if (pos > -1 && matches[2] !== 0) {

diff --git a/src/Core/Context.js b/src/Core/Context.js
@@ -32,7 +32,7 @@ define(function()
 	 */
 	Context.isFullScreen = function IsFullScreen()
 	{
-		return (
+		return !!(
 			document.fullscreenElement ||
 			document.mozFullScreenElement ||
 			document.webkitFullscreenElement ||

diff --git a/src/Core/FileSystem.js b/src/Core/FileSystem.js
@@ -71,7 +71,7 @@ define(function()
 	 */
 	function init( files, save, quota )
 	{
-		var requestFileSystemSync, requestFileSystem, temporaryStorage;
+		var requestFileSystemSync, requestFileSystem;
 		_files = normalizeFilesPath(files);
 
 		if (!_available) {

diff --git a/src/Core/MemoryManager.js b/src/Core/MemoryManager.js
@@ -26,7 +26,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	 * Remove files from memory if not used until a period of time
 	 * @var {number}
 	 */
-	var _remember_time = 2 * 60 * 1000; // 2 min
+	var _rememberTime = 2 * 60 * 1000; // 2 min
 
 
 	/**
@@ -54,7 +54,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 		var item;
 
 		// Not in memory yet, create slot
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			_memory[filename] = new MemoryItem();
 		}
 
@@ -80,7 +80,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	 */
 	function exist( filename )
 	{
-		return filename in _memory;
+		return !!_memory[filename];
 	}
 
 
@@ -94,7 +94,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	function set( filename, data, error )
 	{
 		// Not in memory yet, create slot
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			_memory[filename] = new MemoryItem();
 		}
 
@@ -125,7 +125,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 
 		keys  = Object.keys(_memory);
 		count = keys.length;
-		tick  = now - _remember_time;
+		tick  = now - _rememberTime;
 
 		for (i = 0; i < count; ++i) {
 			item = _memory[ keys[i] ];
@@ -152,7 +152,7 @@ define( ['Core/MemoryItem'], function( MemoryItem )
 	function remove( gl, filename )
 	{
 		// Not found ?
-		if (!exist(filename)) {
+		if (!_memory[filename]) {
 			return;
 		}
 

diff --git a/src/Network/NetworkManager.js b/src/Network/NetworkManager.js
@@ -58,10 +58,10 @@ define(function( require )
 	 * @param {callback} struct - callback to parse the packet
 	 * @param {number} size - packet size
 	 */
-	function Packets( name, struct, size )
+	function Packets( name, Struct, size )
 	{
 		this.name     = name;
-		this.struct   = struct;
+		this.Struct   = Struct;
 		this.size     = size;
 		this.callback = null;
 	}
@@ -182,12 +182,12 @@ define(function( require )
 	 * @param {number} id - packet UID
 	 * @param {function} struct - packet structure callback
 	 */
-	function registerPacket( id, struct ) {
-		struct.id = id;
+	function registerPacket( id, Struct ) {
+		Struct.id = id;
 		Packets.list[id] = new Packets(
-			struct.name,
-			struct,
-			struct.size
+			Struct.name,
+			Struct,
+			Struct.size
 		);
 	}
 
@@ -313,10 +313,10 @@ define(function( require )
 
 			// Parse packet
 			if (!packet.instance) {
-				packet.instance = new packet.struct(fp, offset);
+				packet.instance = new packet.Struct(fp, offset);
 			}
 			else {
-				packet.struct.call(packet.instance, fp, offset);
+				packet.Struct.call(packet.instance, fp, offset);
 			}
 
 			console.log( '%c[Network] Recv:', 'color:#900090', packet.instance, packet.callback ? '' : '(no callback)'  );
@@ -432,16 +432,7 @@ define(function( require )
 	/**
 	 * Export
 	 */
-	return new function Network()
-	{
-		this.sendPacket     = sendPacket;
-		this.send           = send;
-		this.setPing        = setPing;
-		this.connect        = connect;
-		this.hookPacket     = hookPacket;
-		this.close          = close;
-		this.read           = read;
-
+	return (function Network() {
 		var keys;
 		var i, count;
 
@@ -461,8 +452,17 @@ define(function( require )
 			registerPacket( keys[i], PacketRegister[ keys[i] ] );
 		}
 
-		this.utils = {
-			longToIP: utilsLongToIP
+		return {
+			sendPacket: sendPacket,
+			send:       send,
+			setPing:    setPing,
+			connect:    connect,
+			hookPacket: hookPacket,
+			close:      close,
+			read:       read,
+			utils: {
+				longToIP: utilsLongToIP
+			}
 		};
-	}();
+	})();
 });