Changed how regular JSON is loaded.

Now we should be able to safely use javascript comments (by using
eval() - don’t do anything dangerous!).

Author: Andrew Start

bower.json

@@ -1,6 +1,6 @@
 {
 	"name": "preloadjs",
-	"version": "0.4.1",
+	"version": "0.4.2",
 	"main": "lib/preloadjs.min.js",
 	"ignore": [
 		"**/.*",

build/config.json

@@ -8,8 +8,7 @@
 		"../src/preloadjs/AbstractLoader.js",
 		"../src/preloadjs/LoadQueue.js",
 		"../src/preloadjs/TagLoader.js",
-		"../src/preloadjs/XHRLoader.js",
-		"../src/preloadjs/minify.json.js"
+		"../src/preloadjs/XHRLoader.js"
 	],
 
 	"docs_out_path":"./output/PreloadJSDocs/"

build/package.json

@@ -1,6 +1,6 @@
 {
   "name": "PreloadJS",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "PreloadJS Docs",
   "url": "http://www.createjs.com/#!/PreloadJS",
   "logo": "assets/docs-icon-PreloadJS.png",

docs/PreloadJS_docs.zip

@@ -19,15 +19,15 @@ this.createjs = this.createjs||{};
 	 * @type String
 	 * @static
 	 **/
-	s.version = /*version*/"0.4.1"; // injected by build process
+	s.version = /*version*/"0.4.2"; // injected by build process
 
 	/**
 	 * The build date for this release in UTC format.
 	 * @property buildDate
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*date*/"Tue, 29 Apr 2014 15:42:26 GMT"; // injected by build process
+	s.buildDate = /*date*/"Thu, 12 Jun 2014 14:31:43 GMT"; // injected by build process
 
 })();
 /*
@@ -4182,13 +4182,15 @@ this.createjs = this.createjs || {};
 
 			case createjs.LoadQueue.JSON:
 			case createjs.LoadQueue.MANIFEST:
-				var json = {};
+				var json;
 				try {
-					if(JSON.minify && (this._item.data && this._item.data.minify))
+					/*if(JSON.minify && (this._item.data && this._item.data.minify))
 					{
 						this._response = JSON.minify(this._response);
 					}
-					json = JSON.parse(this._response);
+					json = JSON.parse(this._response);*/
+					//use eval to allow javascript comments in the JSON
+					eval("json = " + this._response + ";");//thankfully, uglify won't mangle 'var json' because we use it in eval()
 				} catch (error) {
 					json = error;
 				}
@@ -4597,64 +4599,3 @@ if (typeof JSON !== 'object') {
 		};
 	}
 }());
-/*! JSON.minify()
-	v0.1 (c) Kyle Simpson
-	MIT License
-*/
-
-(function(global){
-	if (typeof global.JSON == "undefined" || !global.JSON) {
-		global.JSON = {};
-	}
-
-	global.JSON.minify = function(json) {
-
-		var tokenizer = /"|(\/\*)|(\*\/)|(\/\/)|\n|\r/g,
-			in_string = false,
-			in_multiline_comment = false,
-			in_singleline_comment = false,
-			tmp, tmp2, new_str = [], ns = 0, from = 0, lc, rc
-		;
-
-		tokenizer.lastIndex = 0;
-
-		while (tmp = tokenizer.exec(json)) {
-			lc = RegExp.leftContext;
-			rc = RegExp.rightContext;
-			if (!in_multiline_comment && !in_singleline_comment) {
-				tmp2 = lc.substring(from);
-				if (!in_string) {
-					tmp2 = tmp2.replace(/(\n|\r|\s)*/g,"");
-				}
-				new_str[ns++] = tmp2;
-			}
-			from = tokenizer.lastIndex;
-
-			if (tmp[0] == "\"" && !in_multiline_comment && !in_singleline_comment) {
-				tmp2 = lc.match(/(\\)*$/);
-				if (!in_string || !tmp2 || (tmp2[0].length % 2) == 0) {	// start of string with ", or unescaped " character found to end string
-					in_string = !in_string;
-				}
-				from--; // include " character in next catch
-				rc = json.substring(from);
-			}
-			else if (tmp[0] == "/*" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-				in_multiline_comment = true;
-			}
-			else if (tmp[0] == "*/" && !in_string && in_multiline_comment && !in_singleline_comment) {
-				in_multiline_comment = false;
-			}
-			else if (tmp[0] == "//" && !in_string && !in_multiline_comment && !in_singleline_comment) {
-				in_singleline_comment = true;
-			}
-			else if ((tmp[0] == "\n" || tmp[0] == "\r") && !in_string && !in_multiline_comment && in_singleline_comment) {
-				in_singleline_comment = false;
-			}
-			else if (!in_multiline_comment && !in_singleline_comment && !(/\n|\r|\s/.test(tmp[0]))) {
-				new_str[ns++] = tmp[0];
-			}
-		}
-		new_str[ns++] = rc;
-		return new_str.join("");
-	};
-})(this);

lib/preloadjs.combined.js

@@ -589,13 +589,15 @@ this.createjs = this.createjs || {};
 
 			case createjs.LoadQueue.JSON:
 			case createjs.LoadQueue.MANIFEST:
-				var json = {};
+				var json;
 				try {
-					if(JSON.minify && (this._item.data && this._item.data.minify))
+					/*if(JSON.minify && (this._item.data && this._item.data.minify))
 					{
 						this._response = JSON.minify(this._response);
 					}
-					json = JSON.parse(this._response);
+					json = JSON.parse(this._response);*/
+					//use eval to allow javascript comments in the JSON
+					eval("json = " + this._response + ";");//thankfully, uglify won't mangle 'var json' because we use it in eval()
 				} catch (error) {
 					json = error;
 				}

lib/preloadjs.min.js

@@ -19,14 +19,14 @@ this.createjs = this.createjs||{};
 	 * @type String
 	 * @static
 	 **/
-	s.version = /*version*/"0.4.1"; // injected by build process
+	s.version = /*version*/"0.4.2"; // injected by build process
 
 	/**
 	 * The build date for this release in UTC format.
 	 * @property buildDate
 	 * @type String
 	 * @static
 	 **/
-	s.buildDate = /*date*/"Tue, 29 Apr 2014 15:42:26 GMT"; // injected by build process
+	s.buildDate = /*date*/"Thu, 12 Jun 2014 14:31:43 GMT"; // injected by build process
 
 })();