Better error handling

joecwallace · joecwallace · commit b78ada4d59c1 · 2012-04-25T16:45:43.000-05:00
diff --git a/views/js.php b/views/js.php
@@ -9,18 +9,22 @@
 });
 
 function rejigger() {
-	reJquery.getJSON(rejigger_version_uri, {
+	reJquery.get(rejigger_version_uri, {
 		uri: window.location.href
 	}, function(data) {
-		if (typeof rejigger_version == 'undefined') {
-			rejigger_version = data.version;
-		}
+		if (data.charAt(0) == '{') {
+			var json = (new Function("return " + data))();
 
-		if (rejigger_version != data.version) {
-			window.location.reload(true);
-		}
-		else {
-			setTimeout("rejigger()", <?= Config::get('rejigger::settings.update_milliseconds', '1000') ?>);
+			if (typeof rejigger_version == 'undefined') {
+				rejigger_version = json.version;
+			}
+
+			if (rejigger_version == json.version) {
+				setTimeout("rejigger()", <?= Config::get('rejigger::settings.update_milliseconds', '1000') ?>);
+				return;
+			}
 		}
+
+		window.location.reload(true);
 	});
 }
