webfontloader 1.0.6 → 1.0.7

data/CHANGELOG

@@ -0,0 +1,31 @@
+master
+
+v1.0.7 (August 31, 2010)
+* Fix that wf-loading was not removed in the case of wf-inactive because of
+  a timeout.
+* Add UserAgent#getDocumentMode to aid in determining font support in IE.
+
+v1.0.6 (July 20, 2010)
+* Add JsDoc comments and type annotations for the Closure compiler. Fixes
+  several small bugs caught by the compiler in doing so.
+
+v1.0.5 (July 12, 2010)
+* webfont.UserAgent now provides getPlatformVersion. WebFont Loader is now
+  packaged as a ruby gem.
+
+v1.0.4 (June 14, 2010)
+* Add a module for Ascender's Fonts Live.
+
+v1.0.3 (June 6, 2010)
+* IE fixes.
+
+v1.0.2 (June 1, 2010)
+* Added a way of loading the WebFont Loader script asynchronously.
+
+v1.0.1 (May 20, 2010)
+* Fix namespace pollution by wrapping all of the code in a closure.
+
+v1.0.0 (May 19, 2010)
+* Initial release!
+* Modules: google, typekit, custom
+* Events: loading, active, inactive, fontloading, fontactive, fontintactive

data/lib/webfontloader.rb

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

data/src/ascender/ascender_script.js

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

data/src/core/eventdispatcher.js

@@ -94,6 +94,9 @@ webfont.EventDispatcher.prototype.dispatchFontInactive = function(fontFamily, fo
 };
 
 webfont.EventDispatcher.prototype.dispatchInactive = function() {
+  this.domHelper_.removeClassName(this.htmlElement_,
+      this.cssClassName_.build(
+          this.namespace_, webfont.EventDispatcher.LOADING));
   this.domHelper_.appendClassName(this.htmlElement_,
       this.cssClassName_.build(
         this.namespace_, webfont.EventDispatcher.INACTIVE));

data/src/core/initialize.js

@@ -3,7 +3,7 @@ var globalName = 'WebFont';
 
 // Provide an instance of WebFont in the global namespace.
 window[globalName] = (function() {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent);
+  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
   var domHelper = new webfont.DomHelper(document, userAgent);
   var asyncCall = function(func, timeout) { setTimeout(func, timeout); };
@@ -23,4 +23,5 @@ webfont.UserAgent.prototype['getEngine'] = webfont.UserAgent.prototype.getEngine
 webfont.UserAgent.prototype['getEngineVersion'] = webfont.UserAgent.prototype.getEngineVersion;
 webfont.UserAgent.prototype['getPlatform'] = webfont.UserAgent.prototype.getPlatform;
 webfont.UserAgent.prototype['getPlatformVersion'] = webfont.UserAgent.prototype.getPlatformVersion;
+webfont.UserAgent.prototype['getDocumentMode'] = webfont.UserAgent.prototype.getDocumentMode;
 webfont.UserAgent.prototype['isSupportingWebFont'] = webfont.UserAgent.prototype.isSupportingWebFont;

data/src/core/useragent.js

@@ -5,17 +5,19 @@
  * @param {string} engineVersion
  * @param {string} platform
  * @param {string} platformVersion
+ * @param {int} documentMode
  * @param {boolean} webFontSupport
  * @constructor
  */
 webfont.UserAgent = function(name, version, engine, engineVersion, platform,
-    platformVersion, webFontSupport) {
+    platformVersion, documentMode, webFontSupport) {
   this.name_ = name;
   this.version_ = version;
   this.engine_ = engine;
   this.engineVersion_ = engineVersion;
   this.platform_ = platform;
   this.platformVersion_ = platformVersion;
+  this.documentMode_ = documentMode;
   this.webFontSupport_ = webFontSupport;
 };
 
@@ -61,6 +63,13 @@ webfont.UserAgent.prototype.getPlatformVersion = function() {
   return this.platformVersion_;
 };
 
+/**
+ * @return {string}
+ */
+webfont.UserAgent.prototype.getDocumentMode = function() {
+  return this.documentMode_;
+};
+
 /**
  * @return {boolean}
  */

data/src/core/useragentparser.js

@@ -2,8 +2,9 @@
  * @param {string} userAgent The browser userAgent string to parse.
  * @constructor
  */
-webfont.UserAgentParser = function(userAgent) {
+webfont.UserAgentParser = function(userAgent, doc) {
   this.userAgent_ = userAgent;
+  this.doc_ = doc;
 };
 
 /**
@@ -23,6 +24,7 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     webfont.UserAgentParser.UNKNOWN,
     webfont.UserAgentParser.UNKNOWN,
     webfont.UserAgentParser.UNKNOWN,
+    undefined,
     false);
 
 /**
@@ -111,11 +113,13 @@ webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
     // For IE we give MSIE as the engine name and the version of IE
     // instead of the specific Trident engine name and version
     return new webfont.UserAgent(name, version, name, version,
-        this.getPlatform_(), this.getPlatformVersion_(), this.getMajorVersion_(version) >= 6);
+        this.getPlatform_(), this.getPlatformVersion_(),
+        this.getDocumentMode_(this.doc_), this.getMajorVersion_(version) >= 6);
   }
   return new webfont.UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
       "MSIE", webfont.UserAgentParser.UNKNOWN,
-      this.getPlatform_(), this.getPlatformVersion_(), false);
+      this.getPlatform_(), this.getPlatformVersion_(),
+      this.getDocumentMode_(this.doc_), false);
 };
 
 /**
@@ -155,7 +159,7 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
     if (version != "") {
       return new webfont.UserAgent("Opera", version, engineName, engineVersion,
           this.getPlatform_(), this.getPlatformVersion_(),
-          this.getMajorVersion_(version) >= 10);
+          this.getDocumentMode_(this.doc_), this.getMajorVersion_(version) >= 10);
     }
   }
   var version = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
@@ -163,11 +167,11 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
   if (version != "") {
     return new webfont.UserAgent("Opera", version, engineName, engineVersion,
         this.getPlatform_(), this.getPlatformVersion_(),
-        this.getMajorVersion_(version) >= 10);
+        this.getDocumentMode_(this.doc_), this.getMajorVersion_(version) >= 10);
   }
   return new webfont.UserAgent("Opera", webfont.UserAgentParser.UNKNOWN,
-      engineName, engineVersion,
-      this.getPlatform_(), this.getPlatformVersion_(), false);
+      engineName, engineVersion, this.getPlatform_(),
+      this.getPlatformVersion_(this.doc_), this.getDocumentMode_(this.doc_), false);
 };
 
 /**
@@ -208,7 +212,8 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   var minor = this.getMatchingGroup_(webKitVersion, /\d+\.(\d+)/, 1);
 
   return new webfont.UserAgent(name, version, "AppleWebKit", webKitVersion,
-      platform, platformVersion, this.getMajorVersion_(webKitVersion) >= 526 ||
+      platform, platformVersion, this.getDocumentMode_(this.doc_),
+      this.getMajorVersion_(webKitVersion) >= 526 ||
       this.getMajorVersion_(webKitVersion) >= 525 && parseInt(minor, 10) >= 13);
 };
 
@@ -260,7 +265,8 @@ webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
     }
   }
   return new webfont.UserAgent(name, version, "Gecko", geckoVersion,
-      this.getPlatform_(), this.getPlatformVersion_(), supportWebFont);
+      this.getPlatform_(), this.getPlatformVersion_(), this.getDocumentMode_(this.doc_),
+      supportWebFont);
 };
 
 /**
@@ -287,3 +293,12 @@ webfont.UserAgentParser.prototype.getMatchingGroup_ = function(str,
   }
   return "";
 };
+
+/**
+ * @private
+ */
+webfont.UserAgentParser.prototype.getDocumentMode_ = function(doc) {
+  if (doc.documentMode) return doc.documentMode;
+  return undefined;
+};
+

data/src/custom/customcss.js

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

data/src/google/googlefontapi.js

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

data/src/typekit/typekit_script.js

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

data/src-test/core/eventdispatchertest.js

@@ -51,7 +51,7 @@ EventDispatcherTest.prototype.testClassNamesOnActiveLoad = function() {
   assertEquals('ns-myfamily-n4-active ns-active', this.fakeHtmlElement_.className);
 };
 
-EventDispatcherTest.prototype.testClassNamesOnInactiveLoad = function() {
+EventDispatcherTest.prototype.testClassNamesOnInactiveFontButActive = function() {
   this.eventDispatcher_.dispatchLoading();
   assertEquals('ns-loading', this.fakeHtmlElement_.className);
   this.eventDispatcher_.dispatchFontLoading('My Family', 'n4');
@@ -88,6 +88,17 @@ EventDispatcherTest.prototype.testEventsOnInactiveLoad = function() {
   assertTrue(this.activeEventCalled_);
 };
 
+EventDispatcherTest.prototype.testClassNamesOnInactiveLoad = function() {
+  this.eventDispatcher_.dispatchLoading();
+  assertEquals('ns-loading', this.fakeHtmlElement_.className);
+  this.eventDispatcher_.dispatchFontLoading('My Family', 'n4');
+  assertEquals('ns-loading ns-myfamily-n4-loading', this.fakeHtmlElement_.className);
+  this.eventDispatcher_.dispatchFontInactive('My Family', 'n4');
+  assertEquals('ns-loading ns-myfamily-n4-inactive', this.fakeHtmlElement_.className);
+  this.eventDispatcher_.dispatchInactive();
+  assertEquals('ns-myfamily-n4-inactive ns-inactive', this.fakeHtmlElement_.className);
+};
+
 EventDispatcherTest.prototype.testClassNamesOnInactive = function() {
   this.eventDispatcher_.dispatchInactive();
   assertEquals('ns-inactive', this.fakeHtmlElement_.className);

data/src-test/core/fonttest.js

@@ -4,6 +4,7 @@ FontTest.prototype.setUp = function() {
   this.fakeHtmlElement_ = { className: '' };
   this.fakeDomHelper_ = {
     appendClassName: function() {},
+    removeClassName: function() {},
     createElement: function(name) {
       return document.createElement(name);
     },
@@ -15,7 +16,7 @@ FontTest.prototype.setUp = function() {
 
 FontTest.prototype.testFontLoad = function() {
   var userAgent = new webfont.UserAgent('Firefox', '3.6', 'Gecko', '1.9.2',
-      'Macintosh', '10.6', true);
+      'Macintosh', '10.6', undefined, true);
   var font = new webfont.WebFont(this.fakeDomHelper_, this.fontModuleLoader_,
       this.fakeHtmlElement_, function(func, timeout) { func(); }, userAgent);
   var self = this;

data/src-test/core/useragenttest.js

@@ -1,8 +1,13 @@
 var UserAgentTest = TestCase('UserAgentTest');
+UserAgentTest.prototype.setUp = function() {
+  this.defaultDocument_ = { };
+  this.ie8Document_ = { documentMode: 8 };
+};
 
 UserAgentTest.prototype.testBrowserIsFirefox = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 GTB7.1");
+      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 GTB7.1",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Firefox", userAgent.getName());
@@ -11,12 +16,30 @@ UserAgentTest.prototype.testBrowserIsFirefox = function() {
   assertEquals("10.5", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.9.2.3", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
+UserAgentTest.prototype.testBrowserIsFirefox4beta = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:2.0b1) Gecko/20100630 Firefox/4.0b1",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("Firefox", userAgent.getName());
+  assertEquals("4.0b1", userAgent.getVersion());
+  assertEquals("Macintosh", userAgent.getPlatform());
+  assertEquals("10.6", userAgent.getPlatformVersion());
+  assertEquals("Gecko", userAgent.getEngine());
+  assertEquals("2.0b1", userAgent.getEngineVersion
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsChrome = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/533.2 (KHTML, like Gecko) Chrome/5.0.342.9 Safari/533.2");
+      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/533.2 (KHTML, like Gecko) Chrome/5.0.342.9 Safari/533.2",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Chrome", userAgent.getName());
@@ -25,12 +48,14 @@ UserAgentTest.prototype.testBrowserIsChrome = function() {
   assertEquals("10_5_8", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("533.2", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsSafari = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10");
+      "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-us) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -39,12 +64,14 @@ UserAgentTest.prototype.testBrowserIsSafari = function() {
   assertEquals("10_5_8", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("531.21.8", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIE = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; InfoPath.2; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)");
+      "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; InfoPath.2; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("MSIE", userAgent.getName());
@@ -53,12 +80,14 @@ UserAgentTest.prototype.testBrowserIsIE = function() {
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("MSIE", userAgent.getEngine());
   assertEquals("7.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPhone = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16");
+      "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -67,13 +96,15 @@ UserAgentTest.prototype.testBrowserIsIPhone = function() {
   assertEquals("3_1_2", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("528.18", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 
 UserAgentTest.prototype.testBrowserIsAndroid = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; Nexus One Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17");
+      "Mozilla/5.0 (Linux; U; Android 2.1-update1; en-us; Nexus One Build/ERE27) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -82,12 +113,14 @@ UserAgentTest.prototype.testBrowserIsAndroid = function() {
   assertEquals("2.1-update1", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("530.17", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsFirefoxLettersVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.9.2a1pre) Gecko/20090405 Ubuntu/9.04 (jaunty) Firefox/3.6a1pre");
+      "Mozilla/5.0 (X11; U; Linux i686; ru-RU; rv:1.9.2a1pre) Gecko/20090405 Ubuntu/9.04 (jaunty) Firefox/3.6a1pre",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Firefox", userAgent.getName());
@@ -96,12 +129,14 @@ UserAgentTest.prototype.testBrowserIsFirefoxLettersVersion = function() {
   assertEquals("i686", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.9.2a1pre", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsFirefoxNoVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081202 Firefox (Debian-2.0.0.19-0etch1)");
+      "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.19) Gecko/20081202 Firefox (Debian-2.0.0.19-0etch1)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Firefox", userAgent.getName());
@@ -110,12 +145,14 @@ UserAgentTest.prototype.testBrowserIsFirefoxNoVersion = function() {
   assertEquals("i686", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.8.1.19", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIELetterVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; Media Center PC 3.0; .NET CLR 1.0.3705; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.1)");
+      "Mozilla/4.0 (compatible; MSIE 7.0b; Windows NT 5.1; Media Center PC 3.0; .NET CLR 1.0.3705; .NET CLR 1.1.4322; .NET CLR 2.0.50727; InfoPath.1)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("MSIE", userAgent.getName());
@@ -124,12 +161,14 @@ UserAgentTest.prototype.testBrowserIsIELetterVersion = function() {
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("MSIE", userAgent.getEngine());
   assertEquals("7.0b", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsOpera = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Opera/9.80 (Linux i686; U; en) Presto/2.5.22 Version/10.51");
+      "Opera/9.80 (Linux i686; U; en) Presto/2.5.22 Version/10.51",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Opera", userAgent.getName());
@@ -138,12 +177,14 @@ UserAgentTest.prototype.testBrowserIsOpera = function() {
   assertEquals("i686", userAgent.getPlatformVersion());
   assertEquals("Presto", userAgent.getEngine());
   assertEquals("2.5.22", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsOperaFirefoxInUAString = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Linux i686 ; U; en; rv:1.8.1) Gecko/20061208 Firefox/2.0.0 Opera 9.70");
+      "Mozilla/5.0 (Linux i686 ; U; en; rv:1.8.1) Gecko/20061208 Firefox/2.0.0 Opera 9.70",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Opera", userAgent.getName());
@@ -152,12 +193,14 @@ UserAgentTest.prototype.testBrowserIsOperaFirefoxInUAString = function() {
   assertEquals("i686", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.8.1", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsOperaBeforeVersion10 = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Opera/9.64 (X11; Linux i686; U; Linux Mint; nb) Presto/2.1.1");
+      "Opera/9.64 (X11; Linux i686; U; Linux Mint; nb) Presto/2.1.1",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Opera", userAgent.getName());
@@ -166,12 +209,14 @@ UserAgentTest.prototype.testBrowserIsOperaBeforeVersion10 = function() {
   assertEquals("i686", userAgent.getPlatformVersion());
   assertEquals("Presto", userAgent.getEngine());
   assertEquals("2.1.1", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIEOnMac = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)");
+      "Mozilla/4.0 (compatible; MSIE 5.23; Mac_PowerPC)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("MSIE", userAgent.getName());
@@ -180,12 +225,14 @@ UserAgentTest.prototype.testBrowserIsIEOnMac = function() {
   assertEquals("Unknown", userAgent.getPlatformVersion());
   assertEquals("MSIE", userAgent.getEngine());
   assertEquals("5.23", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPad = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10");
+      "Mozilla/5.0(iPad; U; CPU iPhone OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B314 Safari/531.21.10",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -194,12 +241,14 @@ UserAgentTest.prototype.testBrowserIsIPad = function() {
   assertEquals("3_2", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("531.21.10", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPadAlt = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B360 Safari/531.21.10");
+      "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B360 Safari/531.21.10",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -208,12 +257,14 @@ UserAgentTest.prototype.testBrowserIsIPadAlt = function() {
   assertEquals("3_2", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("531.21.10", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPadWithoutIPhone = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10");
+      "Mozilla/5.0 (iPad; U; CPU OS 3_2 like Mac OS X; en-us) AppleWebKit/531.21.10 (KHTML, like Gecko) Version/4.0.4 Mobile/7B334b Safari/531.21.10",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -222,12 +273,14 @@ UserAgentTest.prototype.testBrowserIsIPadWithoutIPhone = function() {
   assertEquals("3_2", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("531.21.10", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPod = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Mobile/5H11a");
+      "Mozilla/5.0 (iPod; U; CPU iPhone OS 2_2_1 like Mac OS X; en-us) AppleWebKit/525.18.1 (KHTML, like Gecko) Mobile/5H11a",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Unknown", userAgent.getName());
@@ -236,12 +289,14 @@ UserAgentTest.prototype.testBrowserIsIPod = function() {
   assertEquals("2_2_1", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("525.18.1", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIPodSafari = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (iPod; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16");
+      "Mozilla/5.0 (iPod; U; CPU iPhone OS 3_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7C144 Safari/528.16",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -250,12 +305,14 @@ UserAgentTest.prototype.testBrowserIsIPodSafari = function() {
   assertEquals("3_1", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("528.18", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsSafariWithPlusVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; tr) AppleWebKit/528.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/526.11.2");
+      "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_4_11; tr) AppleWebKit/528.4+ (KHTML, like Gecko) Version/4.0dp1 Safari/526.11.2",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Safari", userAgent.getName());
@@ -264,12 +321,14 @@ UserAgentTest.prototype.testBrowserIsSafariWithPlusVersion = function() {
   assertEquals("10_4_11", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("528.4+", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsIEWithTridentVersion = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; InfoPath.2)");
+      "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; InfoPath.2)",
+      this.ie8Document_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("MSIE", userAgent.getName());
@@ -278,6 +337,7 @@ UserAgentTest.prototype.testBrowserIsIEWithTridentVersion = function() {
   assertEquals("6.1", userAgent.getPlatformVersion());
   assertEquals("MSIE", userAgent.getEngine());
   assertEquals("8.0", userAgent.getEngineVersion());
+  assertEquals(8, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
@@ -285,7 +345,8 @@ UserAgentTest.prototype.testBrowserIsIEWithTridentVersion = function() {
 
 UserAgentTest.prototype.testBrowserGeckoShouldSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.9.1.4) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.9.1.4) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -293,12 +354,14 @@ UserAgentTest.prototype.testBrowserGeckoShouldSupportWebFont = function() {
   assertEquals("Windows", userAgent.getPlatform());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.9.1.4", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoNotExistingVersionShouldSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:2.5.8) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:2.5.8) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -307,12 +370,14 @@ UserAgentTest.prototype.testBrowserGeckoNotExistingVersionShouldSupportWebFont =
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("2.5.8", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoVer110ShouldSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.10.1b) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.10.1b) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -321,12 +386,14 @@ UserAgentTest.prototype.testBrowserGeckoVer110ShouldSupportWebFont = function()
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.10.1b", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertTrue(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoWeirdVerShouldNotSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.b) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.b) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -335,12 +402,14 @@ UserAgentTest.prototype.testBrowserGeckoWeirdVerShouldNotSupportWebFont = functi
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.b", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoYetAnotherWeirdVerShouldNotSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.b) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.b) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -349,12 +418,14 @@ UserAgentTest.prototype.testBrowserGeckoYetAnotherWeirdVerShouldNotSupportWebFon
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.b", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoNoSubVerShouldNotSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.9) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:1.9) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -363,12 +434,14 @@ UserAgentTest.prototype.testBrowserGeckoNoSubVerShouldNotSupportWebFont = functi
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("1.9", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoHighMinorVerShouldNotSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:0.10.1) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:0.10.1) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -377,12 +450,14 @@ UserAgentTest.prototype.testBrowserGeckoHighMinorVerShouldNotSupportWebFont = fu
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("0.10.1", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserGeckoHighSubVerShouldNotSupportWebFont = function() {
   var userAgentParser = new webfont.UserAgentParser(
-      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:0.3.42) Gecko/20091016 (.NET CLR 3.5.30729)");
+      "Mozilla/5.0 (Windows; U; Windows NT 5.1; ru-RU; rv:0.3.42) Gecko/20091016 (.NET CLR 3.5.30729)",
+      this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
   assertEquals("Mozilla", userAgent.getName());
@@ -391,5 +466,6 @@ UserAgentTest.prototype.testBrowserGeckoHighSubVerShouldNotSupportWebFont = func
   assertEquals("5.1", userAgent.getPlatformVersion());
   assertEquals("Gecko", userAgent.getEngine());
   assertEquals("0.3.42", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };

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.6'
-  s.date              = '2010-07-20'
+  s.version           = '1.0.7'
+  s.date              = '2010-08-31'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -65,6 +65,7 @@ DESC
   ## THE MANIFEST COMMENTS, they are used as delimiters by the task.
   # = MANIFEST =
   s.files = %w[
+    CHANGELOG
     Gemfile
     LICENSE
     README.md

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-20 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,6 +83,7 @@ extra_rdoc_files:
 - docs/MODULES.md
 - docs/TRANSITIONS.md
 files: 
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md