From 64fb92dbe0e04cf66964b776c75b9ecee9ab857f Mon Sep 17 00:00:00 2001 From: Lanny McNie Date: Wed, 4 Apr 2018 11:53:58 -0600 Subject: [PATCH 1/6] Fixed code sample --- src/preloadjs/data/Types.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/preloadjs/data/Types.js b/src/preloadjs/data/Types.js index e40c1dc9..93b739ce 100644 --- a/src/preloadjs/data/Types.js +++ b/src/preloadjs/data/Types.js @@ -43,9 +43,10 @@ this.createjs = this.createjs || {}; * a {{#crossLink "LoadQueue"}}{{/crossLink}}. * *

Example

+ * * queue.loadFile({src:"https://somecdn/wfossn3", type:createjs.Types.IMAGE}); * - * You can also use the string value: + * You can also use the string value: * * queue.loadFile({src:"https://somecdn/wfossn3", type:"image"}); * From 63cfaa29eddb70c29fb8607a5409cdd68a350f72 Mon Sep 17 00:00:00 2001 From: Wes Gorgichuk Date: Wed, 21 Nov 2018 08:22:09 -0800 Subject: [PATCH 2/6] Fix main reference in package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1c352e0f..24cd55f8 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "npmName": "preloadjs", "version": "1.0.1", "description": "PreloadJS makes it easy to preload your assets: images, sounds, JavaScript, fonts, JSON, and text data", - "main": "preloadjs.js", + "main": "lib/preloadjs.js", "jsdelivr": "lib/preloadjs.min.js", "directories": { "doc": "docs", From 1402122c28daa3c4c6d8b7f33973c5f9074fa66c Mon Sep 17 00:00:00 2001 From: Lanny McNie Date: Mon, 4 Feb 2019 17:11:29 -0500 Subject: [PATCH 3/6] Updated shared event class --- src/createjs/events/Event.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/createjs/events/Event.js b/src/createjs/events/Event.js index 1a983378..f010e269 100644 --- a/src/createjs/events/Event.js +++ b/src/createjs/events/Event.js @@ -53,8 +53,8 @@ this.createjs = this.createjs||{}; * rely on an event object's state outside of the call stack it was received in. * @class Event * @param {String} type The event type. - * @param {Boolean} bubbles Indicates whether the event will bubble through the display list. - * @param {Boolean} cancelable Indicates whether the default behaviour of this event can be cancelled. + * @param {Boolean} [bubbles=false] Indicates whether the event will bubble through the display list. + * @param {Boolean} [cancelable=false] Indicates whether the default behaviour of this event can be cancelled. * @constructor **/ function Event(type, bubbles, cancelable) { @@ -173,7 +173,7 @@ this.createjs = this.createjs||{}; // public methods: /** - * Sets {{#crossLink "Event/defaultPrevented"}}{{/crossLink}} to true if the event is cancelable. + * Sets {{#crossLink "Event/defaultPrevented:property"}}{{/crossLink}} to true if the event is cancelable. * Mirrors the DOM level 2 event standard. In general, cancelable events that have `preventDefault()` called will * cancel the default behaviour associated with the event. * @method preventDefault @@ -183,7 +183,7 @@ this.createjs = this.createjs||{}; }; /** - * Sets {{#crossLink "Event/propagationStopped"}}{{/crossLink}} to true. + * Sets {{#crossLink "Event/propagationStopped:property"}}{{/crossLink}} to true. * Mirrors the DOM event standard. * @method stopPropagation **/ @@ -192,8 +192,8 @@ this.createjs = this.createjs||{}; }; /** - * Sets {{#crossLink "Event/propagationStopped"}}{{/crossLink}} and - * {{#crossLink "Event/immediatePropagationStopped"}}{{/crossLink}} to true. + * Sets {{#crossLink "Event/propagationStopped:property"}}{{/crossLink}} and + * {{#crossLink "Event/immediatePropagationStopped:property"}}{{/crossLink}} to true. * Mirrors the DOM event standard. * @method stopImmediatePropagation **/ From 160c6c490a37e38c6c47e638fd773efd0452590a Mon Sep 17 00:00:00 2001 From: Keeran Govender Date: Tue, 26 Mar 2019 10:14:24 +0200 Subject: [PATCH 4/6] Added aac to the list of sounds in RequestUtils.js --- src/preloadjs/utils/RequestUtils.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/preloadjs/utils/RequestUtils.js b/src/preloadjs/utils/RequestUtils.js index 69200c25..87a2136f 100644 --- a/src/preloadjs/utils/RequestUtils.js +++ b/src/preloadjs/utils/RequestUtils.js @@ -108,6 +108,7 @@ case "ogg": case "mp3": case "webm": + case "aac": return createjs.Types.SOUND; case "mp4": case "webm": From 615e849f1bdd3ecb45f0760a1e8453a0e0fd31da Mon Sep 17 00:00:00 2001 From: Thijs Van der Schaeghe Date: Mon, 19 Apr 2021 23:35:06 +0200 Subject: [PATCH 5/6] Add crossOrigin property to the AbstractMediaLoader to make those respect the crossOrigin setting (video's can be used in canvasses) --- src/preloadjs/loaders/AbstractMediaLoader.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/preloadjs/loaders/AbstractMediaLoader.js b/src/preloadjs/loaders/AbstractMediaLoader.js index a3a0298e..84a13083 100644 --- a/src/preloadjs/loaders/AbstractMediaLoader.js +++ b/src/preloadjs/loaders/AbstractMediaLoader.js @@ -70,6 +70,12 @@ this.createjs = this.createjs || {}; this._tag = this._createTag(this._item.src); } + var crossOrigin = this._item.crossOrigin; + if (crossOrigin == true) { crossOrigin = "Anonymous"; } + if (crossOrigin != null && !createjs.URLUtils.isLocal(this._item)) { + this._tag.crossOrigin = crossOrigin; + } + this._tag.preload = "auto"; this._tag.load(); From c965d3bd8ac8bbceacf5c85f28c06e22a85a0266 Mon Sep 17 00:00:00 2001 From: Thijs Van der Schaeghe Date: Tue, 20 Apr 2021 17:08:05 +0200 Subject: [PATCH 6/6] Only set crossOrigin to Anonymous when crossOrigin is set to boolean true, to allow setting it to other values than Anonymous by providing a string. --- src/preloadjs/loaders/AbstractMediaLoader.js | 2 +- src/preloadjs/loaders/ImageLoader.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/preloadjs/loaders/AbstractMediaLoader.js b/src/preloadjs/loaders/AbstractMediaLoader.js index 84a13083..ca8841bd 100644 --- a/src/preloadjs/loaders/AbstractMediaLoader.js +++ b/src/preloadjs/loaders/AbstractMediaLoader.js @@ -71,7 +71,7 @@ this.createjs = this.createjs || {}; } var crossOrigin = this._item.crossOrigin; - if (crossOrigin == true) { crossOrigin = "Anonymous"; } + if (crossOrigin === true) { crossOrigin = "Anonymous"; } if (crossOrigin != null && !createjs.URLUtils.isLocal(this._item)) { this._tag.crossOrigin = crossOrigin; } diff --git a/src/preloadjs/loaders/ImageLoader.js b/src/preloadjs/loaders/ImageLoader.js index 87c5c3f6..0f5b89f6 100644 --- a/src/preloadjs/loaders/ImageLoader.js +++ b/src/preloadjs/loaders/ImageLoader.js @@ -94,7 +94,7 @@ this.createjs = this.createjs || {}; } var crossOrigin = this._item.crossOrigin; - if (crossOrigin == true) { crossOrigin = "Anonymous"; } + if (crossOrigin === true) { crossOrigin = "Anonymous"; } if (crossOrigin != null && !createjs.URLUtils.isLocal(this._item)) { this._tag.crossOrigin = crossOrigin; }