webfontloader 1.0.5 → 1.0.6

data/Rakefile

@@ -107,13 +107,15 @@ file "target/webfont.js" => SourceJs + ["target"] do |t|
     ["--compilation_level", "ADVANCED_OPTIMIZATIONS"],
     ["--js_output_file", t.name],
     ["--output_wrapper_marker", %("#{output_marker}")],
-    ["--output_wrapper", %("#{output_wrapper}")]
+    ["--output_wrapper", %("#{output_wrapper}")],
+    ["--warning_level", "VERBOSE"],
+    ["--summary_detail_level", "3"]
   ]
 
   source = @modules.all_source_files
   args.concat source.map { |f| ["--js", f] }
 
-  system "java #{args.flatten.join(' ')}"
+  sh "java #{args.flatten.join(' ')}"
 end
 
 desc "Creates debug version into target/webfont.js"
@@ -166,16 +168,16 @@ task :demodev do
 end
 
 desc "Find out how many bytes the source is"
-task :bytes => "target/webfont.js" do |t|
-  js = t.prerequisites.first
+task :bytes => [:clean, "target/webfont.js"] do |t|
+  js = t.prerequisites.last
   bytes = File.read(js).size
   puts "#{bytes} bytes uncompressed"
 end
 
 desc "Find out how many bytes the source is when gzipped"
-task :gzipbytes => "target/webfont.js" do |t|
+task :gzipbytes => [:clean, "target/webfont.js"] do |t|
   require 'zlib'
-  js = t.prerequisites.first
+  js = t.prerequisites.last
   bytes = Zlib::Deflate.deflate(File.read(js)).size
   puts "#{bytes} bytes gzipped"
 end

data/lib/webfontloader.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'webfontloader/modules'
 
 module WebFontLoader
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 
   ProjectRoot = File.expand_path(File.dirname(__FILE__) + "/..")
 

data/src/ascender/ascender_script.js

@@ -78,7 +78,9 @@ webfont.AscenderScript.prototype.parseVariations = function(source){
   return variations;
 };
 
-WebFont.addModule(webfont.AscenderScript.NAME, function(configuration) {
-  return new webfont.AscenderScript(new webfont.DomHelper(document),
-      configuration);
+window['WebFont'].addModule(webfont.AscenderScript.NAME, function(configuration) {
+  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent);
+  var userAgent = userAgentParser.parse();
+  var domHelper = new webfont.DomHelper(document, userAgent);
+  return new webfont.AscenderScript(domHelper, configuration);
 });

data/src/core/cssclassname.js

@@ -1,17 +1,37 @@
 /**
+ * Handles sanitization and construction of css class names.
+ * @param {string=} opt_joinChar The character to join parts of the name on.
+ *    Defaults to '-'.
  * @constructor
  */
 webfont.CssClassName = function(opt_joinChar) {
+  /** @type {string} */
   this.joinChar_ = opt_joinChar || webfont.CssClassName.DEFAULT_JOIN_CHAR;
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.CssClassName.DEFAULT_JOIN_CHAR = '-';
 
+/**
+ * Sanitizes a string for use as a css class name. Removes non-word and
+ * underscore characters.
+ * @param {string} name The string.
+ * @return {string} The sanitized string.
+ */
 webfont.CssClassName.prototype.sanitize = function(name) {
   return name.replace(/[\W_]+/g, '').toLowerCase();
 };
 
-webfont.CssClassName.prototype.build = function(__args__) {
+/**
+ * Builds a complete css class name given a variable number of parts.
+ * Sanitizes, then joins the parts together.
+ * @param {...string} var_args The parts to join.
+ * @return {string} The sanitized and joined string.
+ */
+webfont.CssClassName.prototype.build = function(var_args) {
   var parts = []
   for (var i = 0; i < arguments.length; i++) {
     parts.push(this.sanitize(arguments[i]));

data/src/core/cssfontfamilyname.js

@@ -1,10 +1,17 @@
 /**
+ * Handles quoting rules for a font family name in css.
  * @constructor
  */
 webfont.CssFontFamilyName = function() {
+  /** @type {string} */
   this.quote_ = '"';
 };
 
+/**
+ * Quotes the name.
+ * @param {string} name The name to quote.
+ * @return {string} The quoted name.
+ */
 webfont.CssFontFamilyName.prototype.quote = function(name) {
   var quoted = [];
   var split = name.split(/,\s*/);

data/src/core/domhelper.js

@@ -1,4 +1,8 @@
 /**
+ * Handles common DOM manipulation tasks. The aim of this library is to cover
+ * the needs of typical font loading. Not more, not less.
+ * @param {HTMLDocument} doc The HTML document we'll manipulate.
+ * @param {webfont.UserAgent} userAgent The current user agent.
  * @constructor
  */
 webfont.DomHelper = function(doc, userAgent) {
@@ -6,6 +10,13 @@ webfont.DomHelper = function(doc, userAgent) {
   this.userAgent_ = userAgent;
 };
 
+/**
+ * Creates an element.
+ * @param {string} elem The element type.
+ * @param {Object=} opt_attr A hash of attribute key/value pairs.
+ * @param {string=} opt_innerHtml Contents of the element.
+ * @return {Element} the new element.
+ */
 webfont.DomHelper.prototype.createElement = function(elem, opt_attr,
     opt_innerHtml) {
   var domElement = this.document_.createElement(elem);
@@ -28,6 +39,13 @@ webfont.DomHelper.prototype.createElement = function(elem, opt_attr,
   return domElement;
 };
 
+/**
+ * Inserts an element into the document. This is intended for unambiguous
+ * elements such as html, body, head.
+ * @param {string} tagName The element name.
+ * @param {Element} e The element to append.
+ * @return {boolean} True if the element was inserted.
+ */
 webfont.DomHelper.prototype.insertInto = function(tagName, e) {
   var t = this.document_.getElementsByTagName(tagName)[0];
 
@@ -47,6 +65,10 @@ webfont.DomHelper.prototype.insertInto = function(tagName, e) {
   return false;
 };
 
+/**
+ * Calls a function when the body tag exists.
+ * @param {function()} callback The function to call.
+ */
 webfont.DomHelper.prototype.whenBodyExists = function(callback) {
   var check = function() {
     if (document.body) {
@@ -58,6 +80,11 @@ webfont.DomHelper.prototype.whenBodyExists = function(callback) {
   check();
 };
 
+/**
+ * Removes an element from the DOM.
+ * @param {Element} node The element to remove.
+ * @return {boolean} True if the element was removed.
+ */
 webfont.DomHelper.prototype.removeElement = function(node) {
   if (node.parentNode) {
     node.parentNode.removeChild(node);
@@ -66,6 +93,11 @@ webfont.DomHelper.prototype.removeElement = function(node) {
   return false;
 };
 
+/**
+ * Creates a link to a CSS document.
+ * @param {string} src The URL of the stylesheet.
+ * @return {Element} a link element.
+ */
 webfont.DomHelper.prototype.createCssLink = function(src) {
   return this.createElement('link', {
     'rel': 'stylesheet',
@@ -73,12 +105,22 @@ webfont.DomHelper.prototype.createCssLink = function(src) {
   });
 };
 
+/**
+ * Creates a link to a javascript document.
+ * @param {string} src The URL of the script.
+ * @return {Element} a script element.
+ */
 webfont.DomHelper.prototype.createScriptSrc = function(src) {
   return this.createElement('script', {
     'src': src
   });
 };
 
+/**
+ * Appends a name to an element's class attribute.
+ * @param {Element} e The element.
+ * @param {string} name The class name to add.
+ */
 webfont.DomHelper.prototype.appendClassName = function(e, name) {
   var classes = e.className.split(/\s+/);
   for (var i = 0, len = classes.length; i < len; i++) {
@@ -90,6 +132,11 @@ webfont.DomHelper.prototype.appendClassName = function(e, name) {
   e.className = classes.join(' ').replace(/^\s+/, '');
 };
 
+/**
+ * Removes a name to an element's class attribute.
+ * @param {Element} e The element.
+ * @param {string} name The class name to remove.
+ */
 webfont.DomHelper.prototype.removeClassName = function(e, name) {
   var classes = e.className.split(/\s+/);
   var remainingClasses = [];

data/src/core/eventdispatcher.js

@@ -1,4 +1,8 @@
 /**
+ * @param {webfont.DomHelper} domHelper
+ * @param {HTMLElement} htmlElement
+ * @param {Object} callbacks
+ * @param {string=} opt_namespace
  * @constructor
  */
 webfont.EventDispatcher = function(domHelper, htmlElement, callbacks,
@@ -10,10 +14,34 @@ webfont.EventDispatcher = function(domHelper, htmlElement, callbacks,
   this.cssClassName_ = new webfont.CssClassName('-');
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.EventDispatcher.DEFAULT_NAMESPACE = 'wf';
+
+/**
+ * @const
+ * @type {string}
+ */
 webfont.EventDispatcher.LOADING = 'loading';
+
+/**
+ * @const
+ * @type {string}
+ */
 webfont.EventDispatcher.ACTIVE = 'active';
+
+/**
+ * @const
+ * @type {string}
+ */
 webfont.EventDispatcher.INACTIVE = 'inactive';
+
+/**
+ * @const
+ * @type {string}
+ */
 webfont.EventDispatcher.FONT = 'font';
 
 webfont.EventDispatcher.prototype.dispatchLoading = function() {
@@ -23,6 +51,10 @@ webfont.EventDispatcher.prototype.dispatchLoading = function() {
   this.dispatch_(webfont.EventDispatcher.LOADING);
 };
 
+/**
+ * @param {string} fontFamily
+ * @param {string} fontDescription
+ */
 webfont.EventDispatcher.prototype.dispatchFontLoading = function(fontFamily, fontDescription) {
   this.domHelper_.appendClassName(this.htmlElement_,
       this.cssClassName_.build(
@@ -31,6 +63,10 @@ webfont.EventDispatcher.prototype.dispatchFontLoading = function(fontFamily, fon
       webfont.EventDispatcher.FONT + webfont.EventDispatcher.LOADING, fontFamily, fontDescription);
 };
 
+/**
+ * @param {string} fontFamily
+ * @param {string} fontDescription
+ */
 webfont.EventDispatcher.prototype.dispatchFontActive = function(fontFamily, fontDescription) {
   this.domHelper_.removeClassName(this.htmlElement_,
       this.cssClassName_.build(
@@ -42,6 +78,10 @@ webfont.EventDispatcher.prototype.dispatchFontActive = function(fontFamily, font
       webfont.EventDispatcher.FONT + webfont.EventDispatcher.ACTIVE, fontFamily, fontDescription);
 };
 
+/**
+ * @param {string} fontFamily
+ * @param {string} fontDescription
+ */
 webfont.EventDispatcher.prototype.dispatchFontInactive = function(fontFamily, fontDescription) {
   this.domHelper_.removeClassName(this.htmlElement_,
       this.cssClassName_.build(
@@ -71,6 +111,11 @@ webfont.EventDispatcher.prototype.dispatchActive = function() {
   this.dispatch_(webfont.EventDispatcher.ACTIVE);
 };
 
+/**
+ * @param {string} event
+ * @param {string=} opt_arg1
+ * @param {string=} opt_arg2
+ */
 webfont.EventDispatcher.prototype.dispatch_ = function(event, opt_arg1, opt_arg2) {
   if (this.callbacks_[event]) {
     this.callbacks_[event](opt_arg1, opt_arg2);

data/src/core/fontvariationdescription.js

@@ -6,11 +6,17 @@ webfont.FontVariationDescription = function() {
   this.values_ = webfont.FontVariationDescription.VALUES;
 };
 
+/**
+ * @const
+ */
 webfont.FontVariationDescription.PROPERTIES = [
   'font-style',
   'font-weight'
 ];
 
+/**
+ * @const
+ */
 webfont.FontVariationDescription.VALUES = {
   'font-style': [
     ['n', 'normal'],
@@ -33,6 +39,7 @@ webfont.FontVariationDescription.VALUES = {
 };
 
 /**
+ * @private
  * @constructor
  */
 webfont.FontVariationDescription.Item = function(index, property, values) {
@@ -59,6 +66,12 @@ webfont.FontVariationDescription.Item.prototype.expand = function(output, value)
   }
 }
 
+/**
+ * Compacts CSS declarations into an FVD.
+ * @param {string} input A string of CSS declarations such as
+ *    'font-weight:normal;font-style:italic'.
+ * @return {string} The equivalent FVD such as 'n4'.
+ */
 webfont.FontVariationDescription.prototype.compact = function(input) {
   var result = ['n', '4'];
   var descriptors = input.split(';');
@@ -78,6 +91,12 @@ webfont.FontVariationDescription.prototype.compact = function(input) {
   return result.join('');
 };
 
+/**
+ * Expands a FVD string into equivalent CSS declarations.
+ * @param {string} fvd The FVD string, such as 'n4'.
+ * @return {?string} The equivalent CSS such as
+ *    'font-weight:normal;font-style:italic' or null if it cannot be parsed.
+ */
 webfont.FontVariationDescription.prototype.expand = function(fvd) {
   if (fvd.length != 2) {
     return null;
@@ -100,6 +119,9 @@ webfont.FontVariationDescription.prototype.expand = function(fvd) {
   }
 }
 
+/**
+ * @private
+ */
 webfont.FontVariationDescription.prototype.getItem_ = function(property) {
   for (var i = 0; i < this.properties_.length; i++) {
     if (property == this.properties_[i]) {

data/src/core/fontwatcher.js

@@ -15,9 +15,25 @@ webfont.FontWatcher = function(domHelper, eventDispatcher, fontSizer,
   this.fvd_ = new webfont.FontVariationDescription();
 };
 
+/**
+ * @type {string}
+ * @const
+ */
 webfont.FontWatcher.DEFAULT_FONT = '_,arial,helvetica';
+
+/**
+ * @type {string}
+ * @const
+ */
 webfont.FontWatcher.DEFAULT_VARIATION = 'n4';
 
+/**
+ * Watches a set of font families.
+ * @param {Array.<string>} fontFamilies The font family names to watch.
+ * @param {Object.<string, Array.<string>>} fontDescriptions The font variations
+ *    of each family to watch. Described with FVD.
+ * @param {boolean} last True if this is the last set of families to watch.
+ */
 webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions, last) {
   var length = fontFamilies.length;
 
@@ -46,6 +62,9 @@ webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions, l
   }
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.watch_ = function(fontFamily, fontDescription, originalSize) {
   this.eventDispatcher_.dispatchFontLoading(fontFamily, fontDescription);
   var requestedFont = this.createHiddenElementWithFont_(this.nameHelper_.quote(fontFamily),
@@ -63,6 +82,9 @@ webfont.FontWatcher.prototype.watch_ = function(fontFamily, fontDescription, ori
   }
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.decreaseCurrentlyWatched_ = function() {
   if (--this.currentlyWatched_ == 0 && this.last_) {
     if (this.success_) {
@@ -73,6 +95,9 @@ webfont.FontWatcher.prototype.decreaseCurrentlyWatched_ = function() {
   }
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.check_ = function(started, originalSize,
     requestedFont, fontFamily, fontDescription) {
   var size = this.fontSizer_.getWidth(requestedFont);
@@ -91,6 +116,9 @@ webfont.FontWatcher.prototype.check_ = function(started, originalSize,
   }
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.asyncCheck_ = function(started, originalSize,
     requestedFont, fontFamily, fontDescription) {
   this.asyncCall_(function(context, func) {
@@ -100,6 +128,9 @@ webfont.FontWatcher.prototype.asyncCheck_ = function(started, originalSize,
   }(this, this.check_), 50);
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.getDefaultFontSize_ = function(fontDescription) {
   var defaultFont = this.createHiddenElementWithFont_(
       webfont.FontWatcher.DEFAULT_FONT, fontDescription);
@@ -109,6 +140,9 @@ webfont.FontWatcher.prototype.getDefaultFontSize_ = function(fontDescription) {
   return size;
 };
 
+/**
+ * @private
+ */
 webfont.FontWatcher.prototype.createHiddenElementWithFont_ = function(
     fontFamily, fontDescription) {
   var variationCss = this.fvd_.expand(fontDescription);

data/src/core/namespace.js

@@ -1,5 +1,10 @@
 var webfont = {};
 
+/**
+ * @param {Object} context
+ * @param {function(...[*])} func
+ * @param {...*} opt_args
+ */
 webfont.bind = function(context, func, opt_args) {
   var args = arguments.length > 2 ?
       Array.prototype.slice.call(arguments, 2) : [];

data/src/core/useragent.js

@@ -1,4 +1,11 @@
 /**
+ * @param {string} name
+ * @param {string} version
+ * @param {string} engine
+ * @param {string} engineVersion
+ * @param {string} platform
+ * @param {string} platformVersion
+ * @param {boolean} webFontSupport
  * @constructor
  */
 webfont.UserAgent = function(name, version, engine, engineVersion, platform,
@@ -12,30 +19,51 @@ webfont.UserAgent = function(name, version, engine, engineVersion, platform,
   this.webFontSupport_ = webFontSupport;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getName = function() {
   return this.name_;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getVersion = function() {
   return this.version_;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getEngine = function() {
   return this.engine_;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getEngineVersion = function() {
   return this.engineVersion_;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getPlatform = function() {
   return this.platform_;
 };
 
+/**
+ * @return {string}
+ */
 webfont.UserAgent.prototype.getPlatformVersion = function() {
   return this.platformVersion_;
 };
 
+/**
+ * @return {boolean}
+ */
 webfont.UserAgent.prototype.isSupportingWebFont = function() {
   return this.webFontSupport_;
 };

data/src/core/useragentparser.js

@@ -1,15 +1,34 @@
 /**
+ * @param {string} userAgent The browser userAgent string to parse.
  * @constructor
  */
 webfont.UserAgentParser = function(userAgent) {
   this.userAgent_ = userAgent;
 };
 
+/**
+ * @const
+ * @type {string}
+ */
 webfont.UserAgentParser.UNKNOWN = "Unknown";
 
-webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(webfont.UserAgentParser.UNKNOWN,
-    webfont.UserAgentParser.UNKNOWN, webfont.UserAgentParser.UNKNOWN, webfont.UserAgentParser.UNKNOWN, false);
+/**
+ * @const
+ * @type {webfont.UserAgent}
+ */
+webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
+    webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
+    false);
 
+/**
+ * Parses the user agent string and returns an object.
+ * @return {webfont.UserAgent}
+ */
 webfont.UserAgentParser.prototype.parse = function() {
   if (this.isIe_()) {
     return this.parseIeUserAgentString_();
@@ -24,6 +43,9 @@ webfont.UserAgentParser.prototype.parse = function() {
   }
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.getPlatform_ = function() {
   var mobileOs = this.getMatchingGroup_(this.userAgent_,
       /(iPod|iPad|iPhone|Android)/, 1);
@@ -43,6 +65,9 @@ webfont.UserAgentParser.prototype.getPlatform_ = function() {
   return webfont.UserAgentParser.UNKNOWN;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
   var macVersion = this.getMatchingGroup_(this.userAgent_,
       /(OS X|Windows NT|Android) ([^;]+)/, 2);
@@ -63,10 +88,16 @@ webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
   return webfont.UserAgentParser.UNKNOWN;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.isIe_ = function() {
   return this.userAgent_.indexOf("MSIE") != -1;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
   var browser = this.getMatchingGroup_(this.userAgent_, /(MSIE [\d\w\.]+)/, 1);
   var engineName = webfont.UserAgentParser.UNKNOWN;
@@ -87,10 +118,16 @@ webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
       this.getPlatform_(), this.getPlatformVersion_(), false);
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.isOpera_ = function() {
   return this.userAgent_.indexOf("Opera") != -1;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
   var engineName = webfont.UserAgentParser.UNKNOWN;
   var engineVersion = webfont.UserAgentParser.UNKNOWN;
@@ -125,18 +162,24 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
 
   if (version != "") {
     return new webfont.UserAgent("Opera", version, engineName, engineVersion,
-        this.getPlatform_(), this.getPlatformVersion_(), 
+        this.getPlatform_(), this.getPlatformVersion_(),
         this.getMajorVersion_(version) >= 10);
   }
   return new webfont.UserAgent("Opera", webfont.UserAgentParser.UNKNOWN,
-      engineName, engineVersion, 
+      engineName, engineVersion,
       this.getPlatform_(), this.getPlatformVersion_(), false);
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.isWebKit_ = function() {
   return this.userAgent_.indexOf("AppleWebKit") != -1;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   var platform = this.getPlatform_();
   var platformVersion = this.getPlatformVersion_();
@@ -166,13 +209,19 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
 
   return new webfont.UserAgent(name, version, "AppleWebKit", webKitVersion,
       platform, platformVersion, this.getMajorVersion_(webKitVersion) >= 526 ||
-      this.getMajorVersion_(webKitVersion) >= 525 && parseInt(minor) >= 13);
+      this.getMajorVersion_(webKitVersion) >= 525 && parseInt(minor, 10) >= 13);
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.isGecko_ = function() {
   return this.userAgent_.indexOf("Gecko") != -1;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
   var name = webfont.UserAgentParser.UNKNOWN;
   var version = webfont.UserAgentParser.UNKNOWN;
@@ -188,7 +237,7 @@ webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
 
       version = versionNum;
       supportWebFont = versionNum != "" && this.getMajorVersion_(versionNum) >= 3 &&
-          parseInt(minor) >= 5;
+          parseInt(minor, 10) >= 5;
     }
   } else if (this.userAgent_.indexOf("Mozilla") != -1) {
     name = "Mozilla";
@@ -200,8 +249,8 @@ webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
   } else {
     if (!supportWebFont) {
       var majorVersion = this.getMajorVersion_(geckoVersion);
-      var intMinorVersion = parseInt(this.getMatchingGroup_(geckoVersion, /\d+\.(\d+)/, 1));
-      var subVersion = parseInt(this.getMatchingGroup_(geckoVersion, /\d+\.\d+\.(\d+)/, 1));
+      var intMinorVersion = parseInt(this.getMatchingGroup_(geckoVersion, /\d+\.(\d+)/, 1), 10);
+      var subVersion = parseInt(this.getMatchingGroup_(geckoVersion, /\d+\.\d+\.(\d+)/, 1), 10);
 
       supportWebFont = majorVersion > 1 ||
           majorVersion == 1 && intMinorVersion > 9 ||
@@ -214,15 +263,21 @@ webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
       this.getPlatform_(), this.getPlatformVersion_(), supportWebFont);
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.getMajorVersion_ = function(version) {
   var majorVersion = this.getMatchingGroup_(version, /(\d+)/, 1);
 
   if (majorVersion != "") {
-    return parseInt(majorVersion);
+    return parseInt(majorVersion, 10);
   }
   return -1;
 };
 
+/**
+ * @private
+ */
 webfont.UserAgentParser.prototype.getMatchingGroup_ = function(str,
     regexp, index) {
   var groups = str.match(regexp);

data/src/custom/customcss.js

@@ -31,7 +31,9 @@ webfont.CustomCss.prototype.supportUserAgent = function(userAgent, support) {
   return support(userAgent.isSupportingWebFont());
 };
 
-WebFont.addModule(webfont.CustomCss.NAME, function(configuration) {
-  return new webfont.CustomCss(new webfont.DomHelper(document),
-      configuration);
+window['WebFont'].addModule(webfont.CustomCss.NAME, function(configuration) {
+  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent);
+  var userAgent = userAgentParser.parse();
+  var domHelper = new webfont.DomHelper(document, userAgent);
+  return new webfont.CustomCss(domHelper, configuration);
 });

data/src/google/googlefontapi.js

@@ -41,9 +41,9 @@ webfont.GoogleFontApi.prototype.load = function(onReady) {
   onReady(fontApiParser.getFontFamilies(), fontApiParser.getVariations());
 };
 
-WebFont.addModule(webfont.GoogleFontApi.NAME, function(configuration) {
+window['WebFont'].addModule(webfont.GoogleFontApi.NAME, function(configuration) {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent);
   var userAgent = userAgentParser.parse();
   return new webfont.GoogleFontApi(userAgent,
-      new webfont.DomHelper(document), configuration);
+      new webfont.DomHelper(document, userAgent), configuration);
 });

data/src/typekit/typekit_script.js

@@ -52,7 +52,10 @@ webfont.TypekitScript.prototype.load = function(onReady) {
   onReady(this.fontFamilies_, this.fontVariations_);
 };
 
-WebFont.addModule(webfont.TypekitScript.NAME, function(configuration) {
-  return new webfont.TypekitScript(window, new webfont.DomHelper(document), configuration);
+window['WebFont'].addModule(webfont.TypekitScript.NAME, function(configuration) {
+  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent);
+  var userAgent = userAgentParser.parse();
+  var domHelper = new webfont.DomHelper(document, userAgent);
+  return new webfont.TypekitScript(window, domHelper, configuration);
 });
 

data/webfontloader.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'webfontloader'
-  s.version           = '1.0.5'
-  s.date              = '2010-07-12'
+  s.version           = '1.0.6'
+  s.date              = '2010-07-20'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -07:00
+date: 2010-07-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency