Merge #469

script/Button.js

@@ -70,6 +70,9 @@ var Button = {
 		var cd = btn.data("cooldown");
 		var id = 'cooldown.'+ btn.attr('id');
 		if(cd > 0) {
+			if(typeof option == 'number') {
+				cd = option;
+			}
 			// param "start" takes value from cooldown time if not specified
 			var start, left;
 			switch(option){