Updated shared classes from PreloadJS

Author: lannymcnie

src/preloadjs/data/LoadItem.js

@@ -104,14 +104,14 @@ this.createjs = this.createjs || {};
 		this.data = null;
 
 		/**
-		 * The request method used for HTTP calls. Both {{#crossLink "AbstractLoader/GET:property"}}{{/crossLink}} or
-		 * {{#crossLink "AbstractLoader/POST:property"}}{{/crossLink}} request types are supported, and are defined as
+		 * The request method used for HTTP calls. Both {{#crossLink "Methods/GET:property"}}{{/crossLink}} or
+		 * {{#crossLink "Methods/POST:property"}}{{/crossLink}} request types are supported, and are defined as
 		 * constants on {{#crossLink "AbstractLoader"}}{{/crossLink}}.
 		 * @property method
 		 * @type {String}
 		 * @default GET
 		 */
-		this.method = createjs.LoadItem.GET;
+		this.method = createjs.Methods.GET;
 
 		/**
 		 * An object hash of name/value pairs to send to the server.

src/preloadjs/loaders/AbstractLoader.js

@@ -194,192 +194,6 @@ this.createjs = this.createjs || {};
 	var p = createjs.extend(AbstractLoader, createjs.EventDispatcher);
 	var s = AbstractLoader;
 
-
-	/**
-	 * Defines a POST request, use for a method value when loading data.
-	 * @property POST
-	 * @type {string}
-	 * @default post
-	 * @deprecated Use Methods.POST instead
-	 * @static
-	 */
-	s.POST = createjs.Methods.POST;
-
-	/**
-	 * Defines a GET request, use for a method value when loading data.
-	 * @property GET
-	 * @type {string}
-	 * @default get
-	 * @deprecated Use Methods.GET instead
-	 * @static
-	 */
-	s.GET = createjs.Methods.GET;
-
-	/**
-	 * The preload type for generic binary types. Note that images are loaded as binary files when using XHR.
-	 * @property BINARY
-	 * @type {String}
-	 * @default binary
-	 * @static
-	 * @deprecated Use createjs.Types.BINARY instead
-	 * @since 0.6.0
-	 */
-	s.BINARY = createjs.Types.BINARY;
-
-	/**
-	 * The preload type for css files. CSS files are loaded using a <link> when loaded with XHR, or a
-	 * <style> tag when loaded with tags.
-	 * @property CSS
-	 * @type {String}
-	 * @default css
-	 * @static
-	 * @deprecated Use createjs.Types.CSS instead
-	 * @since 0.6.0
-	 */
-	s.CSS = createjs.Types.CSS;
-
-	s.FONT = createjs.Types.FONT;
-	s.FONTCSS = createjs.Types.FONTCSS;
-
-	/**
-	 * The preload type for image files, usually png, gif, or jpg/jpeg. Images are loaded into an <image> tag.
-	 * @property IMAGE
-	 * @type {String}
-	 * @default image
-	 * @static
-	 * @deprecated Use createjs.Types.IMAGE instead
-	 * @since 0.6.0
-	 */
-	s.IMAGE = createjs.Types.IMAGE;
-
-	/**
-	 * The preload type for javascript files, usually with the "js" file extension. JavaScript files are loaded into a
-	 * <script> tag.
-	 *
-	 * Since version 0.4.1+, due to how tag-loaded scripts work, all JavaScript files are automatically injected into
-	 * the body of the document to maintain parity between XHR and tag-loaded scripts. In version 0.4.0 and earlier,
-	 * only tag-loaded scripts are injected.
-	 * @property JAVASCRIPT
-	 * @type {String}
-	 * @default javascript
-	 * @static
-	 * @deprecated Use createjs.Types.JAVASCRIPT instead
-	 * @since 0.6.0
-	 */
-	s.JAVASCRIPT = createjs.Types.JAVASCRIPT;
-
-	/**
-	 * The preload type for json files, usually with the "json" file extension. JSON data is loaded and parsed into a
-	 * JavaScript object. Note that if a `callback` is present on the load item, the file will be loaded with JSONP,
-	 * no matter what the {{#crossLink "LoadQueue/preferXHR:property"}}{{/crossLink}} property is set to, and the JSON
-	 * must contain a matching wrapper function.
-	 * @property JSON
-	 * @type {String}
-	 * @default json
-	 * @static
-	 * @deprecated Use createjs.Types.JSON instead
-	 * @since 0.6.0
-	 */
-	s.JSON = createjs.Types.JSON;
-
-	/**
-	 * The preload type for jsonp files, usually with the "json" file extension. JSON data is loaded and parsed into a
-	 * JavaScript object. You are required to pass a callback parameter that matches the function wrapper in the JSON.
-	 * Note that JSONP will always be used if there is a callback present, no matter what the {{#crossLink "LoadQueue/preferXHR:property"}}{{/crossLink}}
-	 * property is set to.
-	 * @property JSONP
-	 * @type {String}
-	 * @default jsonp
-	 * @static
-	 * @deprecated Use createjs.Types.JSONP instead
-	 * @since 0.6.0
-	 */
-	s.JSONP = createjs.Types.JSONP;
-
-	/**
-	 * The preload type for json-based manifest files, usually with the "json" file extension. The JSON data is loaded
-	 * and parsed into a JavaScript object. PreloadJS will then look for a "manifest" property in the JSON, which is an
-	 * Array of files to load, following the same format as the {{#crossLink "LoadQueue/loadManifest"}}{{/crossLink}}
-	 * method. If a "callback" is specified on the manifest object, then it will be loaded using JSONP instead,
-	 * regardless of what the {{#crossLink "LoadQueue/preferXHR:property"}}{{/crossLink}} property is set to.
-	 * @property MANIFEST
-	 * @type {String}
-	 * @default manifest
-	 * @static
-	 * @deprecated Use createjs.Types.MANIFEST instead
-	 * @since 0.6.0
-	 */
-	s.MANIFEST = "manifest";
-
-	/**
-	 * The preload type for sound files, usually mp3, ogg, or wav. When loading via tags, audio is loaded into an
-	 * <audio> tag.
-	 * @property SOUND
-	 * @type {String}
-	 * @default sound
-	 * @static
-	 * @deprecated Use createjs.Types.SOUND instead
-	 * @since 0.6.0
-	 */
-	s.SOUND = createjs.Types.SOUND;
-
-	/**
-	 * The preload type for video files, usually mp4, ts, or ogg. When loading via tags, video is loaded into an
-	 * <video> tag.
-	 * @property VIDEO
-	 * @type {String}
-	 * @default video
-	 * @static
-	 * @deprecated Use createjs.Types.VIDEO instead
-	 * @since 0.6.0
-	 */
-	s.VIDEO = createjs.Types.VIDEO;
-
-	/**
-	 * The preload type for SpriteSheet files. SpriteSheet files are JSON files that contain string image paths.
-	 * @property SPRITESHEET
-	 * @type {String}
-	 * @default spritesheet
-	 * @static
-	 * @deprecated Use createjs.Types.SPRITESHEET instead
-	 * @since 0.6.0
-	 */
-	s.SPRITESHEET = createjs.Types.SPRITESHEET;
-
-	/**
-	 * The preload type for SVG files.
-	 * @property SVG
-	 * @type {String}
-	 * @default svg
-	 * @static
-	 * @deprecated Use createjs.Types.SVG instead
-	 * @since 0.6.0
-	 */
-	s.SVG = createjs.Types.SVG;
-
-	/**
-	 * The preload type for text files, which is also the default file type if the type can not be determined. Text is
-	 * loaded as raw text.
-	 * @property TEXT
-	 * @type {String}
-	 * @default text
-	 * @static
-	 * @deprecated Use createjs.Types.TEXT instead
-	 * @since 0.6.0
-	 */
-	s.TEXT = createjs.Types.TEXT;
-
-	/**
-	 * The preload type for xml files. XML is loaded into an XML document.
-	 * @property XML
-	 * @type {String}
-	 * @default xml
-	 * @static
-	 * @deprecated Use createjs.Types.XML instead
-	 * @since 0.6.0
-	 */
-	s.XML = createjs.Types.XML;
-
 // Events
 	/**
 	 * The {{#crossLink "ProgressEvent"}}{{/crossLink}} that is fired when the overall progress changes. Prior to
@@ -753,16 +567,6 @@ this.createjs = this.createjs || {};
 		this._sendError(event);
 	};
 
-	/**
-	 * @method buildPath
-	 * @protected
-	 * @deprecated Use the {{#crossLink "URLUtils"}}{{/crossLink}} method {{#crossLink "URLUtils/buildURI"}}{{/crossLink}}
-	 * instead.
-	 */
-	p.buildPath = function (src, data) {
-		return createjs.URLUtils.buildURI(src, data);
-	};
-
 	/**
 	 * @method toString
 	 * @return {String} a string representation of the instance.

src/preloadjs/loaders/SoundLoader.js

@@ -50,7 +50,7 @@ this.createjs = this.createjs || {};
 	 * @constructor
 	 */
 	function SoundLoader(loadItem, preferXHR) {
-		this.AbstractMediaLoader_constructor(loadItem, preferXHR, createjs.AbstractLoader.SOUND);
+		this.AbstractMediaLoader_constructor(loadItem, preferXHR, createjs.Types.SOUND);
 
 		// protected properties
 		if (createjs.DomUtils.isAudioTag(loadItem)) {
@@ -72,14 +72,14 @@ this.createjs = this.createjs || {};
 	// static methods
 	/**
 	 * Determines if the loader can load a specific item. This loader can only load items that are of type
-	 * {{#crossLink "AbstractLoader/SOUND:property"}}{{/crossLink}}.
+	 * {{#crossLink "Types/SOUND:property"}}{{/crossLink}}.
 	 * @method canLoadItem
 	 * @param {LoadItem|Object} item The LoadItem that a LoadQueue is trying to load.
 	 * @returns {Boolean} Whether the loader can load the item.
 	 * @static
 	 */
 	s.canLoadItem = function (item) {
-		return item.type == createjs.AbstractLoader.SOUND;
+		return item.type == createjs.Types.SOUND;
 	};
 
 	// protected methods

src/preloadjs/net/XHRRequest.js

@@ -495,21 +495,21 @@ this.createjs = this.createjs || {};
 		this._xhrLevel = (typeof req.responseType === "string") ? 2 : 1;
 
 		var src = null;
-		if (item.method == createjs.AbstractLoader.GET) {
+		if (item.method == createjs.Methods.GET) {
 			src = createjs.URLUtils.buildURI(item.src, item.values);
 		} else {
 			src = item.src;
 		}
 
 		// Open the request.  Set cross-domain flags if it is supported (XHR level 1 only)
-		req.open(item.method || createjs.AbstractLoader.GET, src, true);
+		req.open(item.method || createjs.Methods.GET, src, true);
 
 		if (crossdomain && req instanceof XMLHttpRequest && this._xhrLevel == 1) {
 			headers["Origin"] = location.origin;
 		}
 
 		// To send data we need to set the Content-type header)
-		if (item.values && item.method == createjs.AbstractLoader.POST) {
+		if (item.values && item.method == createjs.Methods.POST) {
 			headers["Content-Type"] = "application/x-www-form-urlencoded";
 		}
 

src/preloadjs/utils/RequestUtils.js

@@ -52,8 +52,8 @@
 	 */
 	s.isBinary = function (type) {
 		switch (type) {
-			case createjs.AbstractLoader.IMAGE:
-			case createjs.AbstractLoader.BINARY:
+			case createjs.Types.IMAGE:
+			case createjs.Types.BINARY:
 				return true;
 			default:
 				return false;
@@ -69,14 +69,14 @@
 	 */
 	s.isText = function (type) {
 		switch (type) {
-			case createjs.AbstractLoader.TEXT:
-			case createjs.AbstractLoader.JSON:
-			case createjs.AbstractLoader.MANIFEST:
-			case createjs.AbstractLoader.XML:
-			case createjs.AbstractLoader.CSS:
-			case createjs.AbstractLoader.SVG:
-			case createjs.AbstractLoader.JAVASCRIPT:
-			case createjs.AbstractLoader.SPRITESHEET:
+			case createjs.Types.TEXT:
+			case createjs.Types.JSON:
+			case createjs.Types.MANIFEST:
+			case createjs.Types.XML:
+			case createjs.Types.CSS:
+			case createjs.Types.SVG:
+			case createjs.Types.JAVASCRIPT:
+			case createjs.Types.SPRITESHEET:
 				return true;
 			default:
 				return false;
@@ -94,7 +94,7 @@
 	 */
 	s.getTypeByExtension = function (extension) {
 		if (extension == null) {
-			return createjs.AbstractLoader.TEXT;
+			return createjs.Types.TEXT;
 		}
 
 		switch (extension.toLowerCase()) {
@@ -104,27 +104,27 @@
 			case "png":
 			case "webp":
 			case "bmp":
-				return createjs.AbstractLoader.IMAGE;
+				return createjs.Types.IMAGE;
 			case "ogg":
 			case "mp3":
 			case "webm":
-				return createjs.AbstractLoader.SOUND;
+				return createjs.Types.SOUND;
 			case "mp4":
 			case "webm":
 			case "ts":
-				return createjs.AbstractLoader.VIDEO;
+				return createjs.Types.VIDEO;
 			case "json":
-				return createjs.AbstractLoader.JSON;
+				return createjs.Types.JSON;
 			case "xml":
-				return createjs.AbstractLoader.XML;
+				return createjs.Types.XML;
 			case "css":
-				return createjs.AbstractLoader.CSS;
+				return createjs.Types.CSS;
 			case "js":
-				return createjs.AbstractLoader.JAVASCRIPT;
+				return createjs.Types.JAVASCRIPT;
 			case 'svg':
-				return createjs.AbstractLoader.SVG;
+				return createjs.Types.SVG;
 			default:
-				return createjs.AbstractLoader.TEXT;
+				return createjs.Types.TEXT;
 		}
 	};