Merge branch 'GMC-0.6.2'

CreateJS · Dec 4, 2015 · b7f7567 · b7f7567
2 parents fc1d351 + a834f77
commit b7f7567
Show file tree

Hide file tree

Showing 22 changed files with 795 additions and 603 deletions.
diff --git a/VERSIONS.txt b/VERSIONS.txt
@@ -1,5 +1,9 @@
 Version NEXT [not yet released]
 ****************************************************************************************************
+
+
+Version 0.6.2 [November 26, 2015]
+****************************************************************************************************
 - Fixed SpriteSheetLoader's JSONP loading
 - Changed LoadQueue Array checks from instanceof to Array.isArray()
 - Fixed using XHR to load sounds and video

diff --git a/_assets/libs/easeljs-NEXT.min.js b/_assets/libs/easeljs-NEXT.min.js
diff --git a/_assets/libs/soundjs-NEXT.min.js b/_assets/libs/soundjs-NEXT.min.js
diff --git a/_assets/libs/tweenjs-NEXT.min.js b/_assets/libs/tweenjs-NEXT.min.js
diff --git a/bower.json b/bower.json
@@ -1,14 +1,14 @@
 {
 	"name": "PreloadJS",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"homepage": "https://github.com/CreateJS/PreloadJS",
 	"authors": [
 		"gskinner",
 		"lannymcnie",
 		"wdamien"
 	],
 	"description": "PreloadJS makes preloading assets & getting aggregate progress events easier in JavaScript. It uses XHR2 when available, and falls back to tag-based loading when not. Part of the CreateJS suite of libraries.",
-	"main": "lib/preloadjs-0.6.1.combined.js",
+	"main": "lib/preloadjs-0.6.2.combined.js",
 	"keywords": [
 		"preload",
 		"xhr",

diff --git a/build/config.json b/build/config.json
@@ -3,8 +3,8 @@
 		"../src/preloadjs/version.js",
 		"../src/createjs/utils/extend.js",
 		"../src/createjs/utils/promote.js",
-		"../src/createjs/utils/indexOf.js",
 		"../src/createjs/utils/proxy.js",
+        "../src/createjs/utils/indexOf.js",
 		"../src/createjs/events/Event.js",
 		"../src/createjs/events/ErrorEvent.js",
 		"../src/createjs/events/EventDispatcher.js",

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "PreloadJS",
-	"version": "0.6.1",
+	"version": "0.6.2",
 	"description": "PreloadJS Docs",
 	"url": "http://www.createjs.com/preloadjs",
 	"logo": "assets/docs-icon-PreloadJS.png",

diff --git a/docs/PreloadJS_docs-0.6.1.zip b/docs/PreloadJS_docs-0.6.1.zip
diff --git a/docs/PreloadJS_docs-0.6.2.zip b/docs/PreloadJS_docs-0.6.2.zip
diff --git a/docs/preloadjs_docs-NEXT.zip b/docs/preloadjs_docs-NEXT.zip
diff --git a/examples/MediaGrid.html b/examples/MediaGrid.html
@@ -202,7 +202,7 @@ <h1>Example: Media Grid</h1>
 				break;
 
 			case createjs.AbstractLoader.IMAGE:
-				div.innerText = "";
+				div.innerHTML = "";
 				result.width = div.clientWidth;
 				result.height = div.clientHeight;
 				div.appendChild(result);

diff --git a/lib/README.txt b/lib/README.txt
@@ -1,3 +1,19 @@
-This directory contains a compressed version of the PreloadJS library.
+# lib directory
+This directory contains compressed versions of the PreloadJS library, including the most recent tagged release and the
+in-progress NEXT release.
 
-You can also gzip the file to further reduce its size (by about 75%). Many servers do this automatically.
+Both combined and minified versions of the library are included. The former being useful for debugging, and the latter
+for deployment.
+
+You can also link to the libraries on the [CreateJS CDN](http://code.createjs.com/), to benefit from faster load times
+and shared caching across sites.
+
+
+# libraries
+**preloadjs-VERSION.min.js** contains minified versions of all of the EaselJS classes (comments and white space stripped).
+**preloadjs-VERSION.combined.js** contains all the EaselJS classes, including whitespace and comments.
+
+
+# license
+The libraries are ©2010 gskinner.com, inc., and made available under the highly permissive MIT open source software
+license. See the source file header for the full license text.
diff --git a/lib/preloadjs-0.6.1.min.js b/lib/preloadjs-0.6.1.min.js