Completed FontLoader integration.

CreateJS · Sep 10, 2015 · 5fb3db0 · 5fb3db0
1 parent 941e165
commit 5fb3db0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 0 deletions.
diff --git a/build/config.json b/build/config.json
@@ -25,6 +25,7 @@
 		"../src/preloadjs/loaders/TextLoader.js",
 		"../src/preloadjs/loaders/BinaryLoader.js",
 		"../src/preloadjs/loaders/CSSLoader.js",
+      "../src/preloadjs/loaders/FontLoader.js",
 		"../src/preloadjs/loaders/ImageLoader.js",
 		"../src/preloadjs/loaders/JavaScriptLoader.js",
 		"../src/preloadjs/loaders/JSONLoader.js",

diff --git a/src/preloadjs/LoadQueue.js b/src/preloadjs/LoadQueue.js
@@ -377,6 +377,7 @@ this.createjs = this.createjs || {};
 		 * @since 0.6.0
 		 */
 		this._availableLoaders = [
+            createjs.FontLoader,
 			createjs.ImageLoader,
 			createjs.JavaScriptLoader,
 			createjs.CSSLoader,
@@ -656,6 +657,24 @@ this.createjs = this.createjs || {};
 	 */
 	s.CSS = createjs.AbstractLoader.CSS;
 
+    /**
+     * @property FONT
+     * @type {String}
+     * @default font
+     * @static
+     * @deprecated Use the AbstractLoader {{#crossLink "AbstractLoader/FONT:property"}}{{/crossLink}} instead.
+     */
+    s.FONT = createjs.AbstractLoader.FONT;
+
+    /**
+     * @property FONTCSS
+     * @type {String}
+     * @default fontcss
+     * @static
+     * @deprecated Use the AbstractLoader {{#crossLink "AbstractLoader/FONTCDD:property"}}{{/crossLink}} instead.
+     */
+    s.FONTCSS = createjs.AbstractLoader.FONTCSS;
+
 	/**
 	 * @property IMAGE
 	 * @type {String}

diff --git a/src/preloadjs/loaders/FontLoader.js b/src/preloadjs/loaders/FontLoader.js
@@ -55,6 +55,18 @@
 
 	}
 	var p = createjs.extend(FontLoader, createjs.AbstractLoader);
+
+    /**
+     * Determines if the loader can load a specific item. This loader can only load items that are of type
+     * {{#crossLink "AbstractLoader/FONT: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
+     */
+    FontLoader.canLoadItem = function (item) {
+        return item.type == createjs.AbstractLoader.FONT || item.type == createjs.AbstractLoader.FONTCSS;
+    };
 
 
 // static properties: