src/core/initialize.js in webfontloader-1.4.11 vs src/core/initialize.js in webfontloader-1.4.12

@@ -1,28 +1,93 @@
 goog.provide('webfont');
 
-goog.require('webfont.UserAgentParser');
-goog.require('webfont.FontModuleLoader');
 goog.require('webfont.WebFont');
 
+goog.require('webfont.modules.Typekit');
+goog.require('webfont.modules.Fontdeck');
+goog.require('webfont.modules.Monotype');
+goog.require('webfont.modules.Custom');
+goog.require('webfont.modules.google.GoogleFontApi');
+
 /**
  * @typedef {Object.<string, Array.<string>>}
  */
 webfont.FontTestStrings;
 
 /**
- * Name of the global object
- *
+ * @define {boolean}
+ */
+var INCLUDE_CUSTOM_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_FONTDECK_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_MONOTYPE_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_TYPEKIT_MODULE = false;
+
+/**
+ * @define {boolean}
+ */
+var INCLUDE_GOOGLE_MODULE = false;
+
+/**
  * @define {string}
  */
-var GLOBAL_NAME = 'WebFont';
+var WEBFONT = 'WebFont';
 
-// Provide an instance of WebFont in the global namespace.
-var globalNamespaceObject = window[GLOBAL_NAME] = (function() {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var fontModuleLoader = new webfont.FontModuleLoader();
-  return new webfont.WebFont(window, fontModuleLoader, userAgent);
-})();
+/**
+ * @define {string}
+ */
+var WEBFONT_CONFIG = 'WebFontConfig';
 
-// Export the public API.
-globalNamespaceObject['load'] = globalNamespaceObject.load;
+/**
+ * @type {webfont.WebFont}
+ */
+var webFontLoader = new webfont.WebFont(goog.global);
+
+if (INCLUDE_CUSTOM_MODULE) {
+  webFontLoader.addModule(webfont.modules.Custom.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Custom(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_FONTDECK_MODULE) {
+  webFontLoader.addModule(webfont.modules.Fontdeck.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Fontdeck(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_MONOTYPE_MODULE) {
+  webFontLoader.addModule(webfont.modules.Monotype.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Monotype(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_TYPEKIT_MODULE) {
+  webFontLoader.addModule(webfont.modules.Typekit.NAME, function (configuration, domHelper) {
+    return new webfont.modules.Typekit(domHelper, configuration);
+  });
+}
+
+if (INCLUDE_GOOGLE_MODULE) {
+  webFontLoader.addModule(webfont.modules.google.GoogleFontApi.NAME, function (configuration, domHelper) {
+    return new webfont.modules.google.GoogleFontApi(domHelper, configuration);
+  });
+}
+
+if (!goog.global[WEBFONT]) {
+  goog.global[WEBFONT] = {};
+  goog.global[WEBFONT]['load'] = goog.bind(webFontLoader.load, webFontLoader);
+
+  if (goog.global[WEBFONT_CONFIG]) {
+    webFontLoader.load(goog.global[WEBFONT_CONFIG]);
+  }
+}