Skip to content

Commit 83c16e3

Browse files
committed
Removed deprecated load types and http methods
1 parent 7eff77b commit 83c16e3

19 files changed

Lines changed: 86 additions & 426 deletions

src/preloadjs/LoadQueue.js

Lines changed: 16 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -160,28 +160,28 @@ this.createjs = this.createjs || {};
160160
* either a non-standard file extension, or are serving the file using a proxy script, then you can pass in a
161161
* <code>type</code> property with any manifest item.
162162
*
163-
* queue.loadFile({src:"path/to/myFile.mp3x", type:createjs.AbstractLoader.SOUND});
163+
* queue.loadFile({src:"path/to/myFile.mp3x", type:createjs.Types.SOUND});
164164
*
165165
* // Note that PreloadJS will not read a file extension from the query string
166-
* queue.loadFile({src:"http://server.com/proxy?file=image.jpg", type:createjs.AbstractLoader.IMAGE});
166+
* queue.loadFile({src:"http://server.com/proxy?file=image.jpg", type:createjs.Types.IMAGE});
167167
*
168168
* Supported types are defined on the {{#crossLink "AbstractLoader"}}{{/crossLink}} class, and include:
169169
* <ul>
170-
* <li>{{#crossLink "AbstractLoader/BINARY:property"}}{{/crossLink}}: Raw binary data via XHR</li>
171-
* <li>{{#crossLink "AbstractLoader/CSS:property"}}{{/crossLink}}: CSS files</li>
172-
* <li>{{#crossLink "AbstractLoader/IMAGE:property"}}{{/crossLink}}: Common image formats</li>
173-
* <li>{{#crossLink "AbstractLoader/JAVASCRIPT:property"}}{{/crossLink}}: JavaScript files</li>
174-
* <li>{{#crossLink "AbstractLoader/JSON:property"}}{{/crossLink}}: JSON data</li>
175-
* <li>{{#crossLink "AbstractLoader/JSONP:property"}}{{/crossLink}}: JSON files cross-domain</li>
176-
* <li>{{#crossLink "AbstractLoader/MANIFEST:property"}}{{/crossLink}}: A list of files to load in JSON format, see
170+
* <li>{{#crossLink "Types/BINARY:property"}}{{/crossLink}}: Raw binary data via XHR</li>
171+
* <li>{{#crossLink "Types/CSS:property"}}{{/crossLink}}: CSS files</li>
172+
* <li>{{#crossLink "Types/IMAGE:property"}}{{/crossLink}}: Common image formats</li>
173+
* <li>{{#crossLink "Types/JAVASCRIPT:property"}}{{/crossLink}}: JavaScript files</li>
174+
* <li>{{#crossLink "Types/JSON:property"}}{{/crossLink}}: JSON data</li>
175+
* <li>{{#crossLink "Types/JSONP:property"}}{{/crossLink}}: JSON files cross-domain</li>
176+
* <li>{{#crossLink "Types/MANIFEST:property"}}{{/crossLink}}: A list of files to load in JSON format, see
177177
* {{#crossLink "AbstractLoader/loadManifest"}}{{/crossLink}}</li>
178-
* <li>{{#crossLink "AbstractLoader/SOUND:property"}}{{/crossLink}}: Audio file formats</li>
179-
* <li>{{#crossLink "AbstractLoader/SPRITESHEET:property"}}{{/crossLink}}: JSON SpriteSheet definitions. This
178+
* <li>{{#crossLink "Types/SOUND:property"}}{{/crossLink}}: Audio file formats</li>
179+
* <li>{{#crossLink "Types/SPRITESHEET:property"}}{{/crossLink}}: JSON SpriteSheet definitions. This
180180
* will also load sub-images, and provide a {{#crossLink "SpriteSheet"}}{{/crossLink}} instance.</li>
181-
* <li>{{#crossLink "AbstractLoader/SVG:property"}}{{/crossLink}}: SVG files</li>
182-
* <li>{{#crossLink "AbstractLoader/TEXT:property"}}{{/crossLink}}: Text files - XHR only</li>
183-
* <li>{{#crossLink "AbstractLoader/VIDEO:property"}}{{/crossLink}}: Video objects</li>
184-
* <li>{{#crossLink "AbstractLoader/XML:property"}}{{/crossLink}}: XML data</li>
181+
* <li>{{#crossLink "Types/SVG:property"}}{{/crossLink}}: SVG files</li>
182+
* <li>{{#crossLink "Types/TEXT:property"}}{{/crossLink}}: Text files - XHR only</li>
183+
* <li>{{#crossLink "Types/VIDEO:property"}}{{/crossLink}}: Video objects</li>
184+
* <li>{{#crossLink "Types/XML:property"}}{{/crossLink}}: XML data</li>
185185
* </ul>
186186
*
187187
* <em>Note: Loader types used to be defined on LoadQueue, but have been moved to AbstractLoader for better
@@ -638,147 +638,6 @@ this.createjs = this.createjs || {};
638638
*/
639639
s.LOAD_TIMEOUT = 0;
640640

641-
// Preload Types
642-
/**
643-
* @property BINARY
644-
* @type {String}
645-
* @default binary
646-
* @static
647-
* @deprecated Use the AbstractLoader.BINARY property instead.
648-
*/
649-
s.BINARY = createjs.AbstractLoader.BINARY;
650-
651-
/**
652-
* @property CSS
653-
* @type {String}
654-
* @default css
655-
* @static
656-
* @deprecated Use the AbstractLoader.CSS property instead.
657-
*/
658-
s.CSS = createjs.AbstractLoader.CSS;
659-
660-
/**
661-
* @property FONT
662-
* @type {String}
663-
* @default font
664-
* @static
665-
* @deprecated Use the AbstractLoader {{#crossLink "AbstractLoader/FONT:property"}}{{/crossLink}} instead.
666-
*/
667-
s.FONT = createjs.AbstractLoader.FONT;
668-
669-
/**
670-
* @property FONTCSS
671-
* @type {String}
672-
* @default fontcss
673-
* @static
674-
* @deprecated Use the AbstractLoader {{#crossLink "AbstractLoader/FONTCDD:property"}}{{/crossLink}} instead.
675-
*/
676-
s.FONTCSS = createjs.AbstractLoader.FONTCSS;
677-
678-
/**
679-
* @property IMAGE
680-
* @type {String}
681-
* @default image
682-
* @static
683-
* @deprecated Use the AbstractLoader.IMAGE property instead.
684-
*/
685-
s.IMAGE = createjs.AbstractLoader.IMAGE;
686-
687-
/**
688-
* @property JAVASCRIPT
689-
* @type {String}
690-
* @default javascript
691-
* @static
692-
* @deprecated Use the AbstractLoader.JAVASCRIPT property instead.
693-
*/
694-
s.JAVASCRIPT = createjs.AbstractLoader.JAVASCRIPT;
695-
696-
/**
697-
* @property JSON
698-
* @type {String}
699-
* @default json
700-
* @static
701-
* @deprecated Use the AbstractLoader.JSON property instead.
702-
*/
703-
s.JSON = createjs.AbstractLoader.JSON;
704-
705-
/**
706-
* @property JSONP
707-
* @type {String}
708-
* @default jsonp
709-
* @static
710-
* @deprecated Use the AbstractLoader.JSONP property instead.
711-
*/
712-
s.JSONP = createjs.AbstractLoader.JSONP;
713-
714-
/**
715-
* @property MANIFEST
716-
* @type {String}
717-
* @default manifest
718-
* @static
719-
* @since 0.4.1
720-
* @deprecated Use the AbstractLoader.MANIFEST property instead.
721-
*/
722-
s.MANIFEST = createjs.AbstractLoader.MANIFEST;
723-
724-
/**
725-
* @property SOUND
726-
* @type {String}
727-
* @default sound
728-
* @static
729-
* @deprecated Use the AbstractLoader.SOUND property instead.
730-
*/
731-
s.SOUND = createjs.AbstractLoader.SOUND;
732-
733-
/**
734-
* @property VIDEO
735-
* @type {String}
736-
* @default video
737-
* @static
738-
* @deprecated Use the AbstractLoader.VIDEO instead.
739-
*/
740-
s.VIDEO = createjs.AbstractLoader.VIDEO;
741-
742-
/**
743-
* @property SVG
744-
* @type {String}
745-
* @default svg
746-
* @static
747-
* @deprecated Use the AbstractLoader.SVG property instead.
748-
*/
749-
s.SVG = createjs.AbstractLoader.SVG;
750-
751-
/**
752-
* @property TEXT
753-
* @type {String}
754-
* @default text
755-
* @static
756-
* @deprecated Use the AbstractLoader.TEXT instead.
757-
*/
758-
s.TEXT = createjs.AbstractLoader.TEXT;
759-
760-
/**
761-
* @property XML
762-
* @type {String}
763-
* @default xml
764-
* @static
765-
* @deprecated Use the AbstractLoader.XML instead.
766-
*/
767-
s.XML = createjs.AbstractLoader.XML;
768-
769-
/**
770-
* @property POST
771-
* @type {string}
772-
* @deprecated Use the AbstractLoader.POST property instead.
773-
*/
774-
s.POST = createjs.AbstractLoader.POST;
775-
776-
/**
777-
* @property GET
778-
* @type {string}
779-
* @deprecated Use the AbstractLoader.GET property instead.
780-
*/
781-
s.GET = createjs.AbstractLoader.GET;
782641

783642
// events
784643
/**
@@ -1079,7 +938,7 @@ this.createjs = this.createjs || {};
1079938
* value is true. If the queue is paused using {{#crossLink "LoadQueue/setPaused"}}{{/crossLink}}, and the value is
1080939
* `true`, the queue will resume automatically.
1081940
* @param {String} [basePath] A base path that will be prepended to each file. The basePath argument overrides the
1082-
* path specified in the constructor. Note that if you load a manifest using a file of type {{#crossLink "AbstractLoader/MANIFEST:property"}}{{/crossLink}},
941+
* path specified in the constructor. Note that if you load a manifest using a file of type {{#crossLink "Types/MANIFEST:property"}}{{/crossLink}},
1083942
* its files will <strong>NOT</strong> use the basePath parameter. <strong>The basePath parameter is deprecated.</strong>
1084943
* This parameter will be removed in a future version. Please either use the `basePath` parameter in the LoadQueue
1085944
* constructor, or a `path` property in a manifest definition.

src/preloadjs/data/LoadItem.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ this.createjs = this.createjs || {};
104104
this.data = null;
105105

106106
/**
107-
* The request method used for HTTP calls. Both {{#crossLink "AbstractLoader/GET:property"}}{{/crossLink}} or
108-
* {{#crossLink "AbstractLoader/POST:property"}}{{/crossLink}} request types are supported, and are defined as
107+
* The request method used for HTTP calls. Both {{#crossLink "Methods/GET:property"}}{{/crossLink}} or
108+
* {{#crossLink "Methods/POST:property"}}{{/crossLink}} request types are supported, and are defined as
109109
* constants on {{#crossLink "AbstractLoader"}}{{/crossLink}}.
110110
* @property method
111111
* @type {String}
112112
* @default GET
113113
*/
114-
this.method = createjs.LoadItem.GET;
114+
this.method = createjs.Methods.GET;
115115

116116
/**
117117
* An object hash of name/value pairs to send to the server.

0 commit comments

Comments
 (0)