Merge branch '2.5'

Conflicts: js/const.js
vrabe · Sep 30, 2015 · 40b2b97 · 40b2b97
2 parents dde49ec + ed95148
commit 40b2b97
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -19,7 +19,6 @@
 	<script type="text/javascript" src="./js/index.js"></script>
 	<script type="text/javascript" src="./js/box.js"></script>
 	<script type="text/javascript" src="./js/material.js"></script>
-	<!--<script type="text/javascript" src="./js/extend.js"></script>-->
 	<script type="text/javascript" src="./js/main.js"></script>
   </head>
   <body>

diff --git a/js/const.js b/js/const.js
@@ -1,4 +1,4 @@
-var version = "2.5 beta 2";
+var version = "2.5";
 //素材資料 (編號,屬性,名稱)
 function materialData(no,element,name){
 	this.no = no;

diff --git a/js/main.js b/js/main.js
@@ -526,7 +526,11 @@ $(document).ready(function() {
 	$("#add #btn-add-enter").click(function(){
 		var a = Number($("#add input[name='no']").val());
 		var b = Number($("#add input[name='quantity']").val());
-		_.debounce(addMonster(a,b,null,null), 250);
+		if(Index.get(a,"evolution") !== undefined){
+			_.debounce(addMonster(a,b,null,null), 250);
+			$("#add input[name='no']").parent().removeClass("has-error");
+		}else
+			$("#add input[name='no']").parent().addClass("has-error");
 	});
 	$("#ultimateBranch .btn-primary").click(function(){
 		var branchChoice = Number($("input[type='radio']:checked", "#ultimateBranch").val());