Fixes to ManifestLoader

CreateJS · Dec 8, 2014 · 659b3d9 · 659b3d9
1 parent b1ab78a
commit 659b3d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/_assets/static/MediaGridManifest.json b/_assets/static/MediaGridManifest.json
@@ -8,7 +8,7 @@ maps({
 		{"id":"static/gbot.svg", "src":"art/gbot.svg"},
 		{"id":"static/grant.json", "src":"static/grant.json"},
 		{"id":"static/font.css", "src":"static/font.css"},
-		{"id":"audio/Thunder.mp3|audio/Thunder.ogg", "src":"audio/Thunder.mp3|audio/Thunder.ogg"},
+		{"id":"audio/Thunder.mp3", "src":"audio/Thunder.mp3"},
 		{"id":"http://gskinner.com/assets/createjs/mapsJSONP.json", "callback":"maps", "type":"jsonp", "src":"http://gskinner.com/assets/createjs/mapsJSONP.json"},
 		{"id":"art/Autumn.png", "src":"art/Autumn.png"},
 	]

diff --git a/examples/MediaGrid.html b/examples/MediaGrid.html
@@ -153,7 +153,7 @@ <h1>Example: Media Grid</h1>
 	}
 
 	function loadManifest() {
-		preload.loadFile({src: "../_assets/static/MediaGridManifest.json", callback: "maps", type: "manifest"}, true, "../_assets/");
+		preload.loadManifest({src: "../_assets/static/MediaGridManifest.json", callback: "maps", type: "manifest"}, true, "../_assets/");
 	}
 
 	function stop() {

diff --git a/src/preloadjs/loaders/ManifestLoader.js b/src/preloadjs/loaders/ManifestLoader.js
@@ -87,7 +87,7 @@ this.createjs = this.createjs || {};
 	// protected methods
 	p._createRequest = function() {
 		var callback = this._item.callback
-		if (callback != null && callback instanceof Function) {
+		if (callback != null) {
 			this._request = new createjs.JSONPLoader(this._item);
 		} else {
 			this._request = new createjs.JSONLoader(this._item);