Skip to content

Commit d00e271

Browse files
committed
sync changes from shared files
1 parent 4a9388f commit d00e271

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

src/createjs/utils/extend.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ this.createjs = this.createjs||{};
4848
*
4949
* var foo = new MySubClass();
5050
* console.log(foo instanceof MySuperClass); // true
51-
* console.log(foo.prototype.constructor === MySubClass); // true
51+
* console.log(Object.getPrototypeOf(foo).constructor === MySubClass); // true
5252
*
5353
* @method extend
5454
* @param {Function} subclass The subclass.

src/preloadjs/loaders/AbstractMediaLoader.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ this.createjs = this.createjs || {};
7070
this._tag = this._createTag(this._item.src);
7171
}
7272

73+
var crossOrigin = this._item.crossOrigin;
74+
if (crossOrigin === true) { crossOrigin = "Anonymous"; }
75+
if (crossOrigin != null && !createjs.URLUtils.isLocal(this._item)) {
76+
this._tag.crossOrigin = crossOrigin;
77+
}
78+
7379
this._tag.preload = "auto";
7480
this._tag.load();
7581

src/preloadjs/utils/RequestUtils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@
108108
case "ogg":
109109
case "mp3":
110110
case "webm":
111+
case "aac":
111112
return createjs.Types.SOUND;
112113
case "mp4":
113114
case "webm":

0 commit comments

Comments
 (0)