Merge remote-tracking branch 'origin/master' into gh-pages

index.html

@@ -164,22 +164,23 @@
 					if (rowsToRemove.length == 0) return;
 
 					rowsToRemove.each(function() {
+						score += $(this).children('.mine').length;
+
 						//add new row on bottom
-						$('#game').append('<ul style="display: none;"></ul>');
+
+						$('#game').append('<ul></ul>');
 
 						for (var i = 0; i < gameBoardWidth; i++) {
 							if (Math.random() < mineChance) {
-								$('#game ul:last-child').append('<li class="mine"></li>');
+								$('#game ul').last().append('<li class="mine"></li>');
 							} else {
-								$('#game ul:last-child').append('<li></li>');
+								$('#game ul').last().append('<li></li>');
 							}
 						}
 					});
 
 					inputEnabled = false;
 
-					//rowsToRemove.remove();
-
 					rowsToRemove.slideUp("slow", function() {
 						$(this).remove();
 
@@ -205,17 +206,17 @@
 							$(this).addClass("revealed");
 						});
 
-						inputEnabled = true;
-
 						//refresh last row to reflect new rows beneath
 						$('li.revealed').last().parent().children('li.revealed').mousedown();
 
 						//click blank tiles
 						$('li.revealed:not(.mine):empty').mousedown();
+
+						//this is a bit of a hack :( oh well
+						$('ul:gt(' + gameBoardHeight + ')').remove();
 					});
 
-					$('ul:hidden').show();
-
+					inputEnabled = true;
 				}
 
 				$.fn.rowScore = function() {