fix some error

vrabe · Aug 13, 2015 · 1a5eb03 · 1a5eb03
1 parent 8a5e3c1
commit 1a5eb03
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/js/index.js b/js/index.js
@@ -12,9 +12,6 @@ var Index = (function() {
 			if(complete[i] === false)
 				return;
 		}
-		name = JSON.parse(window.localStorage.padboxer_name);
-		evolution = JSON.parse(window.localStorage.padboxer_evolution);
-		ultimate = JSON.parse(window.localStorage.padboxer_ultimate);
 		modal.modal('hide');
 		document.location.reload(true);
 	}
@@ -84,9 +81,14 @@ var Index = (function() {
 				if(now - updated > (86400000 * 7))
 					externalLoad();
 				else{
-					name = JSON.parse(window.localStorage.padboxer_name);
-					evolution = JSON.parse(window.localStorage.padboxer_evolution);
-					ultimate = JSON.parse(window.localStorage.padboxer_ultimate);
+					try{
+						name = JSON.parse(window.localStorage.padboxer_name);
+						evolution = JSON.parse(window.localStorage.padboxer_evolution);
+						ultimate = JSON.parse(window.localStorage.padboxer_ultimate);
+					}catch(e){
+						alert(e);
+						externalLoad();
+					}
 				}
 			}
 		},