Panel#takeAndPlaceをStageに移動

lib/panel.js

@@ -27,27 +27,25 @@ class Panel {
 		if (currentCount !== null) {	// null means infinity
 			this.parts.set(blockName, currentCount + 1);
 		}
-		return true;
+		this.update();
 	}
 
 	/**
 	 *  panel上のblockを減らす
 	 *  @param {string} blockName - 消費するblock名
-	 *  @return {bool} 正しくblockを減らせたかどうか
+	 *  @return {undefined}
 	 */
 	take(blockName) {
-		if (!this.parts.has(blockName)) {
-			return false;
-		}
 		const currentCount = this.parts.get(blockName);
 		if (currentCount !== null) {	// null means infinity
 			if (currentCount - 1 === 0) { // take the last block
+				this.selected = null;
 				this.parts.delete(blockName);
 			} else {
 				this.parts.set(blockName, currentCount - 1);
 			}
 		}
-		return true;
+		this.update();
 	}
 
 	update() {

lib/stage.js

@@ -400,17 +400,15 @@ class Stage {
 		const oldBlock = this.board.getBlock(x, y);
 		assert(oldBlock, 'oldBlock is invalid');
 
-		if (blockName === oldBlock.config.name) { // rotate the block
+		if (!blockName || blockName === oldBlock.config.name) { // rotate the block
 			if (oldBlock.config.rotatable) {
 				const rotate = (oldBlock.config.rotate + 1) % 4;
-				this.boardElement.placeBlock({x, y, type: blockName, rotate});
+				this.boardElement.placeBlock({x, y, type: oldBlock.config.name, rotate});
 			}
 		} else { // replace the block
 			// take the block from panel
 			if (blockName !== 'empty') {
-				if (!this.panel.take(blockName)) { // lack the block, can't place it
-					return;
-				}
+				this.panel.take(blockName);
 			}
 
 			// push the old block into panel
@@ -419,7 +417,6 @@ class Stage {
 			}
 
 			this.boardElement.placeBlock({x, y, type: blockName, rotate: 0});
-			this.panel.update();
 		}
 	}
 }