Skip to content

Commit b7f7567

Browse files
author
Lanny McNie
committed
Merge branch 'GMC-0.6.2'
2 parents fc1d351 + a834f77 commit b7f7567

22 files changed

+795
-603
lines changed

VERSIONS.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Version NEXT [not yet released]
22
****************************************************************************************************
3+
4+
5+
Version 0.6.2 [November 26, 2015]
6+
****************************************************************************************************
37
- Fixed SpriteSheetLoader's JSONP loading
48
- Changed LoadQueue Array checks from instanceof to Array.isArray()
59
- Fixed using XHR to load sounds and video

_assets/libs/easeljs-NEXT.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_assets/libs/soundjs-NEXT.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

_assets/libs/tweenjs-NEXT.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "PreloadJS",
3-
"version": "0.6.1",
3+
"version": "0.6.2",
44
"homepage": "https://github.com/CreateJS/PreloadJS",
55
"authors": [
66
"gskinner",
77
"lannymcnie",
88
"wdamien"
99
],
1010
"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.",
11-
"main": "lib/preloadjs-0.6.1.combined.js",
11+
"main": "lib/preloadjs-0.6.2.combined.js",
1212
"keywords": [
1313
"preload",
1414
"xhr",

build/config.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
"../src/preloadjs/version.js",
44
"../src/createjs/utils/extend.js",
55
"../src/createjs/utils/promote.js",
6-
"../src/createjs/utils/indexOf.js",
76
"../src/createjs/utils/proxy.js",
7+
"../src/createjs/utils/indexOf.js",
88
"../src/createjs/events/Event.js",
99
"../src/createjs/events/ErrorEvent.js",
1010
"../src/createjs/events/EventDispatcher.js",

build/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "PreloadJS",
3-
"version": "0.6.1",
3+
"version": "0.6.2",
44
"description": "PreloadJS Docs",
55
"url": "http://www.createjs.com/preloadjs",
66
"logo": "assets/docs-icon-PreloadJS.png",

docs/PreloadJS_docs-0.6.1.zip

-724 KB
Binary file not shown.

docs/PreloadJS_docs-0.6.2.zip

743 KB
Binary file not shown.

docs/preloadjs_docs-NEXT.zip

1.29 KB
Binary file not shown.

examples/MediaGrid.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ <h1>Example: Media Grid</h1>
202202
break;
203203

204204
case createjs.AbstractLoader.IMAGE:
205-
div.innerText = "";
205+
div.innerHTML = "";
206206
result.width = div.clientWidth;
207207
result.height = div.clientHeight;
208208
div.appendChild(result);

lib/README.txt

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1-
This directory contains a compressed version of the PreloadJS library.
1+
# lib directory
2+
This directory contains compressed versions of the PreloadJS library, including the most recent tagged release and the
3+
in-progress NEXT release.
24

3-
You can also gzip the file to further reduce its size (by about 75%). Many servers do this automatically.
5+
Both combined and minified versions of the library are included. The former being useful for debugging, and the latter
6+
for deployment.
7+
8+
You can also link to the libraries on the [CreateJS CDN](http://code.createjs.com/), to benefit from faster load times
9+
and shared caching across sites.
10+
11+
12+
# libraries
13+
**preloadjs-VERSION.min.js** contains minified versions of all of the EaselJS classes (comments and white space stripped).
14+
**preloadjs-VERSION.combined.js** contains all the EaselJS classes, including whitespace and comments.
15+
16+
17+
# license
18+
The libraries are ©2010 gskinner.com, inc., and made available under the highly permissive MIT open source software
19+
license. See the source file header for the full license text.

lib/preloadjs-0.6.1.min.js

-13
This file was deleted.

0 commit comments

Comments
 (0)