Merge pull request doublespeakgames#501 from lucasloisp/jshint-compli…

…ance

Improved JSHint compliance in the code

lib/translate.js

@@ -63,7 +63,7 @@
 			return target;
 		}
 
-		if (target in translation == false)
+		if (target in translation === false)
 		{
 			if (dynoTrans != null)
 			{
@@ -79,7 +79,7 @@
 		}
 
 		return result;
-	};
+	}
 
 	window._ = translate;
 

script/Button.js

@@ -109,8 +109,8 @@ var Button = {
 		}
 	},
 
-	clearCooldown: function(btn, ended) {
-		var ended = ended || false;
+	clearCooldown: function(btn, cooldownEnded) {
+		var ended = cooldownEnded || false;
 		if(!ended){
 			$('div.cooldown', btn).stop(true, true);
 		}

script/engine.js

@@ -427,7 +427,7 @@
 						}
 					}
 				}
-			})
+			});
 		},
 
 		share: function() {

script/events.js

@@ -153,7 +153,7 @@ var Events = {
 			string = 'resume.';
 			log = 'paused';
 		}
-		btn.children('.text').first().text( _(string) )
+		btn.children('.text').first().text( _(string) );
 		Events.paused = (state == 'auto') ? 'auto' : true;
 		event.addClass('paused');
 		Button.clearCooldown(btn);
@@ -189,6 +189,7 @@ var Events = {
 				break;
 			case 'auto':
 				Button.cooldown(btn);
+				/* falls through */
 			default:
 				log = 'resumed';
 				time = Events._PAUSE_COOLDOWN * 1000;
@@ -373,8 +374,8 @@ var Events = {
 						out = true;
 					}
 				}
-				for(var k in mod) {
-					Path.outfit[k] += mod[k];
+				for(var m in mod) {
+					Path.outfit[m] += mod[m];
 				}
 				if(out) {
 					Button.setDisabled(btn, true);
@@ -596,11 +597,12 @@ var Events = {
 		if(weight > freeSpace) {
 			// Draw the drop menu
 			Engine.log('drop menu');
+			var dropMenu;
 			if($('#dropMenu').length){
-				var dropMenu = $('#dropMenu');
+				dropMenu = $('#dropMenu');
 				$('#dropMenu').empty();
 			} else {
-				var dropMenu = $('<div>').attr({'id': 'dropMenu', 'data-legend': _('drop:')});
+				dropMenu = $('<div>').attr({'id': 'dropMenu', 'data-legend': _('drop:')});
 				needsAppend = true;
 			}
 			for(var k in Path.outfit) {
@@ -676,9 +678,10 @@ var Events = {
 			}
 		}
 		lootButtons.appendTo(desc);
+		var takeET = null;
 		if(lootButtons.children().length > 0) {
 			var takeETrow = $('<div>').addClass('takeETrow');
-			var takeET = new Button.Button({
+			takeET = new Button.Button({
 				id: 'loot_takeEverything',
 				text: '',
 				cooldown: Events._LEAVE_COOLDOWN,
@@ -773,10 +776,10 @@ var Events = {
 		World.updateSupplies();
 	},
 
-	getLoot: function(btn, skipButtonSet) {
+	getLoot: function(btn, stateSkipButtonSet) {
 		var name = btn.attr('id').substring(5).replace('-', ' ');
 		if(btn.data('numLeft') > 0) {
-			var skipButtonSet = skipButtonSet || false;
+			var skipButtonSet = stateSkipButtonSet || false;
 			var weight = Path.getWeight(name);
 			var freeSpace = Path.getFreeSpace();
 			if(weight <= freeSpace) {
@@ -857,8 +860,9 @@ var Events = {
 		}
 
 		// Draw any loot
+		var takeETbtn;
 		if(scene.loot) {
-			var takeETbtn = Events.drawLoot(scene.loot);
+			takeETbtn = Events.drawLoot(scene.loot);
 		}
 
 		// Draw the buttons
@@ -1113,7 +1117,7 @@ var Events = {
 				if(typeof target[i] == 'function'){
 					target[i]();
 				} else {
-					$SM.remove(stateName)
+					$SM.remove(stateName);
 				}
 			}
 		}
@@ -1127,7 +1131,7 @@ var Events = {
 		if(delay){
 			$SM.set(state, delay);
 		} else {
-			var delay = $SM.get(state, true)
+			delay = $SM.get(state, true);
 		}
 		var time = Engine.setInterval(function(){
 			// update state every half second

script/events/room.js

@@ -292,8 +292,8 @@ Events.Room = [
 				text: [
 					_('the wanderer leaves, cart loaded with wood')
 				],
-				action: function(delay) {
-					var delay = delay || false;
+				action: function(inputDelay) {
+					var delay = inputDelay || false;
 					Events.saveDelay(function() {
 						$SM.add('stores.wood', 300);
 						Notifications.notify(Room, _('the mysterious wanderer returns, cart piled high with wood.'));
@@ -315,8 +315,8 @@ Events.Room = [
 				text: [
 					_('the wanderer leaves, cart loaded with wood')
 				],
-				action: function(delay) {
-					var delay = delay || false;
+				action: function(inputDelay) {
+					var delay = inputDelay || false;
 					Events.saveDelay(function() {
 						$SM.add('stores.wood', 1500);
 						Notifications.notify(Room, _('the mysterious wanderer returns, cart piled high with wood.'));
@@ -371,8 +371,8 @@ Events.Room = [
 				text: [
 					_('the wanderer leaves, cart loaded with furs')
 				],
-				action: function(delay) {
-					var delay = delay || false;
+				action: function(inputDelay) {
+					var delay = inputDelay || false;
 					Events.saveDelay(function() {
 						$SM.add('stores.fur', 300);
 						Notifications.notify(Room, _('the mysterious wanderer returns, cart piled high with furs.'));
@@ -394,8 +394,8 @@ Events.Room = [
 				text: [
 					_('the wanderer leaves, cart loaded with furs')
 				],
-				action: function(delay) {
-					var delay = delay || false;
+				action: function(inputDelay) {
+					var delay = inputDelay || false;
 					Events.saveDelay(function() {
 						$SM.add('stores.fur', 1500);
 						Notifications.notify(Room, _('the mysterious wanderer returns, cart piled high with furs.'));

script/localization.js

@@ -65,5 +65,5 @@
 		_('the compass points southwest')
 	]; 
 
-	delete keywords;
+	keywords = null;
 })();

script/outside.js

@@ -619,14 +619,14 @@ var Outside = {
 		}
 		/// TRANSLATORS : Mind the whitespace at the end.
 		var s = _('the traps contain ');
-		for(var i = 0, len = msg.length; i < len; i++) {
-			if(len > 1 && i > 0 && i < len - 1) {
+		for(var l = 0, len = msg.length; l < len; l++) {
+			if(len > 1 && l > 0 && l < len - 1) {
 				s += ", ";
-			} else if(len > 1 && i == len - 1) {
+			} else if(len > 1 && l == len - 1) {
 				/// TRANSLATORS : Mind the whitespaces at the beginning and end.
 				s += _(" and ");
 			}
-			s += msg[i];
+			s += msg[l];
 		}
 
 		var baitUsed = numBait < numTraps ? numBait : numTraps;
@@ -643,7 +643,7 @@ var Outside = {
 			Outside.updateVillage();
 			Outside.updateWorkersView();
 			Outside.updateVillageIncome();
-		};
+		}
 	},
 
 	scrollSidebar: function(direction, reset) {

script/path.js

@@ -341,7 +341,7 @@ var Path = {
 		var momentum = 10;
 
 		if( direction == 'up' )
-			momentum = momentum * -1
+			momentum = momentum * -1;
 
 		if( direction == 'down' && inView( direction, $('#perks') ) ){
 

script/room.js

@@ -1093,9 +1093,9 @@ var Room = {
 				var costTooltip = $('.tooltip', craftable.button);
 				costTooltip.empty();
 				var cost = craftable.cost();
-				for(var k in cost) {
-					$("<div>").addClass('row_key').text(_(k)).appendTo(costTooltip);
-					$("<div>").addClass('row_val').text(cost[k]).appendTo(costTooltip);
+				for(var c in cost) {
+					$("<div>").addClass('row_key').text(_(c)).appendTo(costTooltip);
+					$("<div>").addClass('row_val').text(cost[c]).appendTo(costTooltip);
 				}
 				if(max && !craftable.button.hasClass('disabled')) {
 					Notifications.notify(Room, craftable.maxMsg);
@@ -1108,34 +1108,34 @@ var Room = {
 			}
 		}
 
-		for(var k in Room.TradeGoods) {
-			good = Room.TradeGoods[k];
-			var max = $SM.num(k, good) + 1 > good.maximum;
+		for(var g in Room.TradeGoods) {
+			good = Room.TradeGoods[g];
+			var goodsMax = $SM.num(g, good) + 1 > good.maximum;
 			if(good.button == null) {
-				if(Room.buyUnlocked(k)) {
+				if(Room.buyUnlocked(g)) {
 					good.button = new Button.Button({
-						id: 'build_' + k,
+						id: 'build_' + g,
 						cost: good.cost(),
-						text: _(k),
+						text: _(g),
 						click: Room.buy,
 						width: '80px',
 						ttPos: buySection.children().length > 10 ? 'top right' : 'bottom right'
-					}).css('opacity', 0).attr('buildThing', k).appendTo(buySection).animate({opacity:1}, 300, 'linear');
+					}).css('opacity', 0).attr('buildThing', g).appendTo(buySection).animate({opacity:1}, 300, 'linear');
 				}
 			} else {
 				// refresh the tooltip
-				var costTooltip = $('.tooltip', good.button);
-				costTooltip.empty();
-				var cost = good.cost();
-				for(var k in cost) {
-					$("<div>").addClass('row_key').text(_(k)).appendTo(costTooltip);
-					$("<div>").addClass('row_val').text(cost[k]).appendTo(costTooltip);
+				var goodsCostTooltip = $('.tooltip', good.button);
+				goodsCostTooltip.empty();
+				var goodCost = good.cost();
+				for(var gc in goodCost) {
+					$("<div>").addClass('row_key').text(_(gc)).appendTo(goodsCostTooltip);
+					$("<div>").addClass('row_val').text(goodCost[gc]).appendTo(goodsCostTooltip);
 				}
-				if(max && !good.button.hasClass('disabled')) {
+				if(goodsMax && !good.button.hasClass('disabled')) {
 					Notifications.notify(Room, good.maxMsg);
 				}
 			}
-			if(max) {
+			if(goodsMax) {
 				Button.setDisabled(good.button, true);
 			} else {
 				Button.setDisabled(good.button, false);

script/scoring.js

@@ -13,7 +13,7 @@ var Score = {
 		var fullScore = 0;
 
 		var factor = [1, 1.5, 1, 2, 2, 3, 3, 2, 2, 2, 2, 1.5, 1, 
-			     1, 10, 30, 50, 100, 150, 150, 3, 3, 5, 4]
+			     1, 10, 30, 50, 100, 150, 150, 3, 3, 5, 4];
 		for(var i = 0; i< factor.length; i++){
 			fullScore += scoreUnadded[i] * factor[i];
 		}

script/space.js

@@ -372,8 +372,8 @@ var Space = {
 		clearTimeout(Events._eventTimeout);
 		clearTimeout(Room._fireTimer);
 		clearTimeout(Room._tempTimer);
-		for(var k in Room.Craftables) {
-			Room.Craftables[k].button = null;
+		for(var j in Room.Craftables) {
+			Room.Craftables[j].button = null;
 		}
 		for(var k in Room.TradeGoods) {
 			Room.TradeGoods[k].button = null;

script/state_manager.js

@@ -54,10 +54,10 @@ var StateManager = {
 	createState: function(stateName, value) {
 		var words = stateName.split(/[.\[\]'"]+/);
 		//for some reason there are sometimes empty strings
-		for (var i = 0; i < words.length; i++) {
-			if (words[i] === '') {
-				words.splice(i, 1);
-				i--;
+		for (var j = 0; j < words.length; j++) {
+			if (words[j] === '') {
+				words.splice(j, 1);
+				j--;
 			}
 		}
 		var obj = State;
@@ -218,7 +218,7 @@ var StateManager = {
 
 	fireUpdate: function(stateName, save){
 		var category = $SM.getCategory(stateName);
-		if(stateName == undefined) stateName = category = 'all'; //best if this doesn't happen as it will trigger more stuff
+		if(stateName === undefined) stateName = category = 'all'; //best if this doesn't happen as it will trigger more stuff
 		$.Dispatch('stateUpdate').publish({'category': category, 'stateName':stateName});
 		if(save) Engine.saveGame();
 	},

script/world.js

@@ -685,7 +685,7 @@ var World = {
 		// Place landmarks
 		for(var k in World.LANDMARKS) {
 			var landmark = World.LANDMARKS[k];
-			for(var i = 0; i < landmark.num; i++) {
+			for(var l = 0; l < landmark.num; l++) {
 				var pos = World.placeLandmark(landmark.minRadius, landmark.maxRadius, k, map);
 			}
 		}
@@ -713,7 +713,7 @@ var World = {
 					targets[index] = {
 						x : i - World.RADIUS,
 						y : j - World.RADIUS,
-					}
+					};
 					index++;
 					if(index === max){
 						// optimisation: stop the research if maximum number of items has been reached
@@ -796,8 +796,8 @@ var World = {
 		}
 
 		var list = [];
-		for(var t in chances) {
-			list.push(chances[t] + '' + t);
+		for(var j in chances) {
+			list.push(chances[j] + '' + j);
 		}
 		list.sort(function(a, b) {
 			var n1 = parseFloat(a.substring(0, a.length - 1));
@@ -807,8 +807,8 @@ var World = {
 
 		var c = 0;
 		var r = Math.random();
-		for(var i in list) {
-			var prob = list[i];
+		for(var l in list) {
+			var prob = list[l];
 			c += parseFloat(prob.substring(0,prob.length - 1));
 			if(r < c) {
 				return prob.charAt(prob.length - 1);