merged from master (use strict)

app/Bootstrap/HttpServer.js

@@ -7,6 +7,8 @@ define([
 
 function (http, nodeStatic, Api, fs) {
 
+	"use strict";
+
     function HttpServer (options, coordinator) {
         options.port = options.port || 1234;
         options.caching = typeof options.caching != 'undefined' ? options.caching : 3600;

app/Bootstrap/Socket.js

@@ -4,6 +4,8 @@ define([
 
 function (io) {
 
+	"use strict";
+
     function Socket (server, options, coordinator) {
         options.logLevel = typeof options.logLevel != 'undefined'
             ? options.logLevel

app/Game/Channel/Collision/Detector.js

@@ -4,6 +4,8 @@ define([
 
 function (Parent) {
 
+	"use strict";
+
     function Detector () {
         Parent.call(this);
     }

app/Game/Channel/GameController.js

@@ -14,6 +14,8 @@ define([
 
 function (Parent, PhysicsEngine, Settings, PlayerController, requestAnimFrame, Nc, Box2D, Player, GameObject, Doll, RagDoll) {
 
+	"use strict";
+
     function GameController (options) {
 
         this.animationTimeout = null;

app/Game/Channel/GameObjects/Doll.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (Parent, Item, Box2D, Nc) {
+
+	"use strict";
  
     function Doll(physicsEngine, uid, player) {
     	Parent.call(this, physicsEngine, uid, player);
@@ -15,10 +17,12 @@ function (Parent, Item, Box2D, Nc) {
  
     Doll.prototype.findCloseItem = function(x, y) {
 
+        var self = this;
+
     	function findItem(array) {
         	for (var i = 0; i < array.length; i++) {
         		var item = array[i];
-        		if(item.isGrabbingAllowed(this.player)) {
+        		if(item.isGrabbingAllowed(self.player)) {
         			return item;
         		}
         	}

app/Game/Channel/GameObjects/Item.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (Parent) {
+
+	"use strict";
  
     function Item(physicsEngine, uid, options) {
     	Parent.call(this, physicsEngine, uid, options);

app/Game/Channel/GameObjects/Items/RagDoll.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Settings, Nc) {
+
+	"use strict";
  
     function RagDoll(physicsEngine, uid, options) {
         this.scheduledForDestruction = false;

app/Game/Channel/GameObjects/Items/Rube.js

@@ -4,6 +4,8 @@ define([
  
 function (Parent) {
 
+	"use strict";
+
     return Parent;
  
 });

app/Game/Channel/GameObjects/SpectatorDoll.js

@@ -4,6 +4,8 @@ define([
  
 function (Parent) {
 
+	"use strict";
+
     return Parent;
  
 });

app/Game/Channel/Loader/Level.js

@@ -6,6 +6,8 @@ define([
 
 function (Parent, Settings, FileSystem) {
 
+	"use strict";
+
     function Level (uid, engine, gameObjects) {
         Parent.call(this, uid, engine, gameObjects);
     }

app/Game/Channel/Loader/TiledLevel.js

@@ -4,6 +4,8 @@ define([
  
 function (Parent) {
 
+	"use strict";
+
     return Parent;
  
 });

app/Game/Channel/PipeToServer.js

@@ -5,6 +5,8 @@ define([
 
 function (Nc, Channel) {
 
+	"use strict";
+
     function PipeToServer (process) {
 
         var self = this;

app/Game/Channel/Player.js

@@ -4,6 +4,8 @@ define([
 ],
  
 function (Parent, Nc) {
+
+	"use strict";
  
     function Player(id, physicsEngine, user) {
     	Parent.call(this, id, physicsEngine, user);

app/Game/Client/AudioPlayer.js

@@ -2,6 +2,8 @@ define([
 ],
  
 function () {
+
+	"use strict";
  
     function AudioPlayer(path) {
     	this.audio = new Audio(path);

app/Game/Client/Collision/Detector.js

@@ -4,6 +4,8 @@ define([
 
 function (Parent) {
 
+	"use strict";
+
     function Detector () {
         Parent.call(this);
     }

app/Game/Client/Control/Inputs/Gamepad.js

@@ -4,6 +4,8 @@ define([
 ],
  
 function (Parent, Settings) {
+
+	"use strict";
  
     function GamepadInput(playerController) {
     	this.playerController = playerController;

app/Game/Client/Control/KeyboardInput.js

@@ -1,55 +0,0 @@
-define([
-    "Game/Client/Control/Key"
-], 
-
-function (Key) {
-
-    function KeyboardInput () {
-        this._registry = {};        
-        this.init();
-    }
-
-    KeyboardInput.prototype.init = function () {    
-        // Using window is ok here because it only runs in the browser
-        window.onkeydown = this._onKeyDown.bind(this);
-        window.onkeyup = this._onKeyUp.bind(this);
-    }
-
-    KeyboardInput.prototype.registerKey = function (keyCode, onKeyDown, onKeyUp) {
-        var key = new Key();
-        if(onKeyDown) key.setKeyDownFunction(onKeyDown);
-        if(onKeyUp) key.setKeyUpFunction(onKeyUp);
-        this._registry[keyCode] = key;
-    }
-
-    KeyboardInput.prototype._getKeyByKeyCode = function (keyCode) {
-        return this._registry[keyCode];
-    }
-
-    KeyboardInput.prototype._onKeyDown = function (e) {
-        var key = this._getKeyByKeyCode(e.keyCode);
-
-        if (key && !key.getActive()) {
-            var callback = key.getKeyDownFunction();
-            if(callback) callback();
-            key.setActive(true);
-        }
-        
-        // Prevent tab from changing focus
-        if(e.keyCode == 9) return false;
-    }
-
-    KeyboardInput.prototype._onKeyUp = function (e) {
-        var key = this._getKeyByKeyCode(e.keyCode);
-        if (key && key.getActive()) {
-            var callback = key.getKeyUpFunction();
-            if(callback) callback();
-            key.setActive(false);
-        }
-
-        // Prevent tab from changing focus
-        if(e.keyCode == 9) return false;
-    }
-
-    return KeyboardInput;
-});

app/Game/Client/Control/PlayerController.js

@@ -7,6 +7,8 @@ define([
 
 function (Parent, Nc, KeyboardAndMouse, Gamepad) {
 
+	"use strict";
+
     function PlayerController (me) {
 
         Parent.call(this, me);

app/Game/Client/GameController.js

@@ -17,6 +17,8 @@ define([
 
 function (Parent, Box2D, PhysicsEngine, ViewManager, PlayerController, Nc, requestAnimFrame, Settings, GameObject, Doll, DomController, ProtocolHelper, Me, AudioPlayer) {
 
+	"use strict";
+
     if (!window.cancelAnimationFrame) {
         window.cancelAnimationFrame = function(id) {
             clearTimeout(id);

app/Game/Client/GameObjects/Doll.js

@@ -8,6 +8,8 @@ define([
 ],
  
 function (Parent, Settings, Nc, Exception, ColorConverter, Layer) {
+
+	"use strict";
  
     function Doll(physicsEngine, uid, player) {   
         this.layerId = Layer.ID.SPAWN;

app/Game/Client/GameObjects/GameObject.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Exception, Nc) {
+
+	"use strict";
  
     function GameObject(physicsEngine, uid) {
     	Parent.call(this, physicsEngine, uid);

app/Game/Client/GameObjects/Item.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (Parent, Settings, Nc, Layer) {
+
+	"use strict";
  
     function Item(physicsEngine, uid, options) {
         this.layerId = Layer.ID.ITEM;

app/Game/Client/GameObjects/Items/RagDoll.js

@@ -7,6 +7,8 @@ define([
 ],
  
 function (Parent, CoreItem, Settings, Nc, Layer) {
+
+	"use strict";
  
     function RagDoll(physicsEngine, uid, options) {
         this.layerId = Layer.ID.SPAWN;

app/Game/Client/GameObjects/Items/Rube.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (Parent) {
+
+	"use strict";
  
     function Rube(physicsEngine, uid, options) {
     	Parent.call(this, physicsEngine, uid, options);

app/Game/Client/GameObjects/SpectatorDoll.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (Parent) {
+
+	"use strict";
  
     function SpectatorDoll(physicsEngine, uid) {
     	Parent.call(this, physicsEngine, uid);

app/Game/Client/GameObjects/Tile.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (Parent, Settings, Nc, Layer) {
+
+	"use strict";
  
     function Tile(physicsEngine, uid, options) {
         this.layerId = Layer.ID.TILE;

app/Game/Client/Loader/Level.js

@@ -8,6 +8,8 @@ define([
 
 function (Parent, Settings, Nc, PIXI, AbstractLayer) {
 
+	"use strict";
+
     function Level (uid, engine, gameObjects) {
         Parent.call(this, uid, engine, gameObjects);
     }

app/Game/Client/Loader/TiledLevel.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Settings, Nc) {
+
+	"use strict";
  
     function TiledLevel(uid, engine, gameObjects) {
         this.layerId = "background";

app/Game/Client/Me.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Settings, Nc) {
+
+	"use strict";
  
     function Me(id, physicsEngine, user) {
     	Parent.call(this, id, physicsEngine, user);

app/Game/Client/Networker.js

@@ -9,6 +9,8 @@ define([
 
 function (ProtocolHelper, GameController, User, Nc, Settings, DomController) {
 
+	"use strict";
+
     function Networker (socketLink, channelName, nickname) {
         this.channelName = channelName;
         this.nickname = nickname;

app/Game/Client/Physics/Engine.js

@@ -8,6 +8,8 @@ define([
 
 function (Parent, Settings, DomController, Box2D, Nc) {
 
+	"use strict";
+
     function Engine () {
         Parent.call(this);
 

app/Game/Client/Player.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Nc, Settings) {
+
+	"use strict";
  
     function Player(id, physicsEngine, user) {
     	Parent.call(this, id, physicsEngine, user);

app/Game/Client/View/Abstract/Layer.js

@@ -4,6 +4,8 @@ define([
 
 function (Abstract) {
 
+	"use strict";
+
     function Layer(name, parallaxSpeed) {
     	this.name = name;
     	this.parallaxSpeed = parallaxSpeed;

app/Game/Client/View/Abstract/View.js

@@ -7,6 +7,8 @@ define([
 ],
 
 function (Abstract, DomController, Settings, Exception, Nc) {
+
+	"use strict";
     
     function AbstractView () {
     	this.me = null;

app/Game/Client/View/DomController.js

@@ -7,6 +7,8 @@ define([
 
 function (Settings, Nc, Stats, Screenfull) {
 
+	"use strict";
+
     function DomController() {
         this.canvas = document.getElementById("canvas");
         this.debugCanvas = null;

app/Game/Client/View/LayerManager.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Nc, Exception, Layer) {
+
+	"use strict";
  
     function LayerManager(container, me) {
         this.layers = [];

app/Game/Client/View/Mesh.js

@@ -7,6 +7,8 @@ define([
 
 function (Settings, Nc, Stats, Screenfull) {
 
+	"use strict";
+
     function Mesh() {
 
     }

app/Game/Client/View/Pixi/ColorRangeReplaceFilter.js

@@ -4,6 +4,8 @@ define([
  
 function (PIXI) {
 
+	"use strict";
+
     var Parent = PIXI.AbstractFilter;
  
     function ColorRangeReplaceFilter() {

app/Game/Client/View/Pixi/GameStats.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (PIXI, Nc, Settings, ColorConverter) {
+
+	"use strict";
  
     function GameStats(container) {
 

app/Game/Client/View/Pixi/Layer.js

@@ -7,6 +7,8 @@ define([
 
 function (Parent, PIXI, ColorRangeReplaceFilter, Settings) {
 
+	"use strict";
+
     var AVAILABLE_MESH_FILTERS = {
         "blur": PIXI.BlurFilter,
         "desaturate": PIXI.GrayFilter,

app/Game/Client/View/Pixi/Layers/Ghost.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (Parent, PIXI, Nc, Settings) {
+
+	"use strict";
  
     function Ghost() {
     	Parent.call(this, "ghost", 0);

app/Game/Client/View/Pixi/View.js

@@ -13,6 +13,8 @@ define([
 
 function (Parent, DomController, PIXI, Settings, Nc, Exception, GameStats, LayerManager, Ghost, Swiper) {
 
+	"use strict";
+
     function PixiView () {
 
         Parent.call(this);

app/Game/Client/View/Three/View.js

@@ -6,6 +6,8 @@ define([
 ], 
 
 function (Parent, DomController, Three, Settings) {
+
+	"use strict";
     
     function ThreeView () {
         Parent.call(this);

app/Game/Client/View/ViewManager.js

@@ -8,6 +8,8 @@ define([
 ],
  
 function (Settings, Exception, AbstractView, PixiView, Nc) {
+
+	"use strict";
  
     var ViewManager = {};
 

app/Game/Core/Collision/Detector.js

@@ -4,6 +4,8 @@ define([
 
 function (Box2D) {
 
+	"use strict";
+
     function Detector () {
         this.listener = new Box2D.Dynamics.b2ContactListener();
         this.listener.BeginContact = this.beginContact.bind(this);

app/Game/Core/GameController.js

@@ -8,6 +8,8 @@ define([
 
 function (PhysicsEngine, TiledLevel, Player, Nc, Doll) {
 
+	"use strict";
+
     function GameController (options) {
 
         this.options = options;

app/Game/Core/GameObjects/Doll.js

@@ -9,6 +9,8 @@ define([
 
 function (Parent, Box2D, Settings, CollisionDetector, Item, Nc) {
 
+	"use strict";
+
     function Doll (physicsEngine, uid, player) {
 
         this.characterName = "Chuck";

app/Game/Core/GameObjects/GameObject.js

@@ -4,6 +4,8 @@ define([
 ],
  
 function (Box2D, Exception) {
+
+	"use strict";
  
     function GameObject(physicsEngine, uid) {
         this.uid = uid;

app/Game/Core/GameObjects/Item.js

@@ -8,6 +8,8 @@ define([
 ],
  
 function (Parent, Box2D, Options, Settings, Exception, Nc) {
+
+	"use strict";
  
     function Item(physicsEngine, uid, options) {
 

app/Game/Core/GameObjects/Items/RagDoll.js

@@ -6,6 +6,8 @@ define([
 ],
  
 function (Parent, Box2D, Settings, Nc) {
+
+	"use strict";
  
     function RagDoll(physicsEngine, uid, options) {
 

app/Game/Core/GameObjects/Items/RagDoll2.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Box2D, Settings) {
+
+	"use strict";
  
 	function RagDoll(physicsEngine, uid, options) {
 		Parent.call(this, physicsEngine, uid, options);

app/Game/Core/GameObjects/Items/Rube.js

@@ -7,6 +7,8 @@ define([
 
 function (Parent, RubeLoader, Box2D, Settings ) {
 
+	"use strict";
+
     // Fixme - make this loadable
     var __ragdollJson; 
  

app/Game/Core/GameObjects/Items/Skateboard.js

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent, Box2D, Settings) {
+
+	"use strict";
  
     function Skateboard(physicsEngine, uid, options) {
 

app/Game/Core/GameObjects/SpectatorDoll.js

@@ -4,6 +4,8 @@ define([
 ], 
  
 function (Parent, Box2D) {
+
+	"use strict";
  
     function SpectatorDoll(physicsEngine, uid, player) {
     	Parent.call(this, physicsEngine, uid);

app/Game/Core/GameObjects/Tile.js

@@ -7,6 +7,8 @@ define([
 ],
  
 function (Parent, Box2D, Settings, Exception, Nc) {
+
+	"use strict";
  
     function Tile(physicsEngine, uid, options) {
     	this.options = options;

app/Game/Core/Physics/Engine.js

@@ -7,6 +7,8 @@ define([
 
 function (Settings, Box2D, CollisionDetector, Nc) {
 
+	"use strict";
+
     function Engine () {
         this.world = new Box2D.Dynamics.b2World(
             new Box2D.Common.Math.b2Vec2(0, Settings.BOX2D_GRAVITY),

app/Game/Core/Player.js

@@ -7,9 +7,10 @@ define([
     "Game/" + GLOBALS.context + "/GameObjects/Items/RagDoll"
 ],
 
-
 function (Doll, Settings, Nc, Exception, SpectatorDoll, RagDoll) {
 
+	"use strict";
+
     function Player (id, physicsEngine, user) {
         this.stats = {
             health: 100,

app/Lib/Utilities/Abstract.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (Exception) {
+
+	"use strict";
  
     function Abstract() {
     }

app/Lib/Utilities/ColorConverter.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (CryptoJS) {
+
+	"use strict";
  
     function ColorConverter() {
     	this.sin = 0;

app/Lib/Utilities/NotificationCenter.js

@@ -4,6 +4,8 @@ define([
 
 function (Exception) {
 
+	"use strict";
+
     function populate(obj, path) {
         path = path || "Nc.ns";
         for(var key in obj) {

app/Lib/Utilities/Options.js

@@ -3,6 +3,8 @@ define([
 ],
  
 function (Exception) {
+
+	"use strict";
  
     function Options() {
 

app/Lib/Utilities/Protocol/Helper.js

@@ -5,6 +5,8 @@ define([
 
 function (Parser, Exception) {
 
+	"use strict";
+
     var Helper = {}
 
     Helper.encodeCommand = function (command, options) {

app/Lib/Utilities/Protocol/Parser.js

@@ -3,6 +3,8 @@ define([
 
 function () {
 
+	"use strict";
+
     var Parser = {};
 
     Parser.encode = function (message) {

app/Lib/Utilities/RequestAnimFrame.js

@@ -4,6 +4,8 @@ define([
 
 function (Settings) {
 
+	"use strict";
+
     var requestAnimFrame = (function () {
 
         var _setTimeout = function ( callback ) {

app/Lib/Utilities/Validate.js

@@ -2,6 +2,8 @@ define([
 ],
  
 function () {
+
+	"use strict";
  
     function validate(object, description) {
 

app/Menu/Menu.js

@@ -5,6 +5,8 @@ define([
  
 function (ColorConverter, Exception) {
 
+	"use strict";
+
 	var instance = null
  
     function Menu() {

app/Server/Api.js

@@ -9,6 +9,8 @@ define([
  
 function (Nc, ProtocolHelper, validate, Options, Settings, FileSystem) {
 
+	"use strict";
+
 		function Api(coordinator) {
 			this.coordinator = coordinator;
 			this.isError = false;

app/Server/Coordinator.js

@@ -8,6 +8,8 @@ define([
 
 function (User, Channel, PipeToChannel, Nc, Settings) {
 
+	"use strict";
+
     function Coordinator() {
     	this.channelPipes = {};
 

app/Server/PipeToChannel.js

@@ -5,6 +5,8 @@ define([
 
 function (Nc, childProcess) {
 
+	"use strict";
+
 	var fork = childProcess.fork;
 
 	function PipeToChannel (options) {

app/Server/User.js

@@ -6,6 +6,8 @@ define([
 
 function (Parent, ProtocolHelper, Nc) {
 
+	"use strict";
+
     function User (socketLink, coordinator) {
         Parent.call(this, socketLink.id, {});
 

channel.js

@@ -1,4 +1,6 @@
-GLOBALS = { context: "Channel" };
+"use strict";
+
+var GLOBALS = { context: "Channel" };
 var requirejs = require('requirejs');
 
 requirejs.config({

client.js

@@ -1,4 +1,6 @@
-GLOBALS = { context: "Client" };
+"use strict";
+
+var GLOBALS = { context: "Client" };
 
 requirejs.config({
     baseUrl: 'app',

server.js

@@ -1,4 +1,6 @@
-GLOBALS = { context: "Channel" };
+"use strict";
+
+var GLOBALS = { context: "Channel" };
 var requirejs = require('requirejs');
 
 var inspector;

snippets/sublime/js-define-child.sublime-snippet

@@ -6,6 +6,8 @@ define([
  
 function (Parent) {
 
+	"use strict";
+
     return Parent;
  
 });

snippets/sublime/js-define-extend.sublime-snippet

@@ -5,6 +5,8 @@ define([
 ],
  
 function (Parent) {
+
+    "use strict";
  
     function ${1:Module}() {
     	Parent.call(this);

snippets/sublime/js-define.sublime-snippet

@@ -4,8 +4,11 @@ define([
 ],
  
 function () {
+
+    "use strict";
  
     function ${1:Module}() {
+        
     }
  
     ${1:Module}.prototype.${2:name} = function(${3:arguments}) {