Merge pull request #1 from kdepp/master

fix cs: get config.json
A9T9 · Jan 26, 2018 · 1cbce85 · 1cbce85
2 parents 66f4abe + 928acfd
commit 1cbce85
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/cs.js b/scripts/cs.js
@@ -346,7 +346,8 @@
 			)
 			.done(function (config, htmlStr) {
 				HTMLSTRCOPY = htmlStr[0];
-				OCRTranslator.APPCONFIG = APPCONFIG = JSON.parse(config[0]);
+				// Note: it seems like with jQuery 3+,  $.get (ajax) directly returns a json object if you're loading a json file
+				OCRTranslator.APPCONFIG = APPCONFIG = typeof config[0] === 'string' ? JSON.parse(config[0]) : config[0];
 				$dfd.resolve(APPCONFIG, HTMLSTRCOPY);
 			})
 			.fail(function (err) {