webfontloader 1.1.0 → 1.1.1

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.1.1 (December 12, 2012)
+* Added the ability to recognize BlackBerry devices, which have web font support (WOFF) in platform version 10+
+* Added a new browser name "BuiltinBrowser" to recognize built-in browsers on mobile platforms which we previously called "Safari" (applies to Android's "Browser" app and BlackBerry's built-in browser)
+* Fixed a bug in the Monotype module which caused a double active event in IE9 and no active event in IE8 (reported in issue #64)
+* Fixed some typos in the demo pages
+
 v1.1.0 (December 5, 2012)
 * Adds the ability to load fonts into a same-origin child window or iframe using the new optional `context` configuration option (thanks to @ryanwolf of Google).
 * Updates the demos to fix broken stuff and demonstrate the new context option in action.

data/README.md

@@ -147,6 +147,7 @@ Then, run the tests.
 * Ryan Carver / ryan@typekit.com
 * Jeremie Lenfant-engelmann /  jeremiele@google.com
 * Sean McBride / sean@typekit.com
+* Bram Stein / bram@typekit.com
 
 
 ## License

data/lib/webfontloader.rb

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

data/lib/webfontloader/demo/public/event-js-font-active.html

@@ -10,9 +10,9 @@
         api: '/fonts/api'
       },
       fontactive: function(familyName, fontDescription) {
-        if (fontFamilyName == 'Droid Sans') {
+        if (familyName == 'Droid Sans') {
           var h1 = document.getElementsByTagName('h1')[0];
-          h1.innerHTML = 'Hello World. I am ' + fontFamilyName + ' (' + fontDescription + ')';
+          h1.innerHTML = 'Hello World. I am ' + familyName + ' (' + fontDescription + ')';
         }
       }
     });

data/src-test/core/useragenttest.js

@@ -196,21 +196,36 @@ UserAgentTest.prototype.testBrowserIsIPhone = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
-
 UserAgentTest.prototype.testBrowserIsAndroid = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (Linux; U; Android 2.2.1; en-ca; LG-P505R Build/FRG83) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("BuiltinBrowser", userAgent.getName());
+  assertEquals("Unknown", userAgent.getVersion());
+  assertEquals("Android", userAgent.getPlatform());
+  assertEquals("2.2.1", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("533.1", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
+UserAgentTest.prototype.testBrowserIsOldUnsupportedAndroid = 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",
       this.defaultDocument_);
   var userAgent = userAgentParser.parse();
 
-  assertEquals("Safari", userAgent.getName());
-  assertEquals("4.0", userAgent.getVersion());
+  assertEquals("BuiltinBrowser", userAgent.getName());
+  assertEquals("Unknown", userAgent.getVersion());
   assertEquals("Android", userAgent.getPlatform());
   assertEquals("2.1-update1", userAgent.getPlatformVersion());
   assertEquals("AppleWebKit", userAgent.getEngine());
   assertEquals("530.17", userAgent.getEngineVersion());
   assertEquals(undefined, userAgent.getDocumentMode());
-  assertTrue(userAgent.isSupportingWebFont());
+  assertFalse(userAgent.isSupportingWebFont());
 };
 
 UserAgentTest.prototype.testBrowserIsAndroidChromeMobile = function() {
@@ -670,3 +685,35 @@ UserAgentTest.prototype.testBrowserGeckoHighSubVerShouldNotSupportWebFont = func
   assertEquals(undefined, userAgent.getDocumentMode());
   assertFalse(userAgent.isSupportingWebFont());
 };
+
+UserAgentTest.prototype.testBrowserBBSupportWebfont = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (BB10; Touch) AppleWebKit/537.3+ (KHTML, like Gecko) Version/10.0.9.388 Mobile Safari/537.3+",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("BuiltinBrowser", userAgent.getName());
+  assertEquals("Unknown", userAgent.getVersion());
+  assertEquals("BlackBerry", userAgent.getPlatform());
+  assertEquals("10.0.9.388", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("537.3+", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
+UserAgentTest.prototype.testBrowserBBNotSupportWebfont = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (BlackBerry; U; BlackBerry 9900; en) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.346 Mobile Safari/534.11+",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("BuiltinBrowser", userAgent.getName());
+  assertEquals("Unknown", userAgent.getVersion());
+  assertEquals("BlackBerry", userAgent.getPlatform());
+  assertEquals("7.1.0.346", userAgent.getPlatformVersion());
+  assertEquals("AppleWebKit", userAgent.getEngine());
+  assertEquals("534.11+", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertFalse(userAgent.isSupportingWebFont());
+};

data/src-test/monotype/monotype_script_test.js

@@ -8,8 +8,10 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAdded = function () {
   var config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc', api: "http://fast.fonts.com/jsapidev" };
 
   var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
+    createElement: function () {
+      script = {
+        addEventListener: function () {}
+      };
       return script;
     },
     insertInto: function (tag, elem) {
@@ -67,8 +69,10 @@ MonotypeScriptTest.prototype.testIfScriptTagHasCorrectSSL = function () {
   var config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc', api: "http://fast.fonts.com/jsapidev" };
 
   var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
+    createElement: function () {
+      script = {
+        addEventListener: function () {}
+      };
       return script;
     },
     insertInto: function (tag, elem) {
@@ -139,8 +143,10 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurl = function () {
   var config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc' };
 
   var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
+    createElement: function () {
+      script = {
+        addEventListener: function () {}
+      };
       return script;
     },
     insertInto: function (tag, elem) {
@@ -199,8 +205,10 @@ MonotypeScriptTest.prototype.testIfScriptTagIsAddedWithoutApiurlAndTheScriptUrlH
   var config = { projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc' };
 
   var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
+    createElement: function () {
+      script = {
+        addEventListener: function () {}
+      };
       return script;
     },
     insertInto: function (tag, elem) {
@@ -259,8 +267,10 @@ MonotypeScriptTest.prototype.testWithoutProjectId = function () {
   var config = {};
 
   var fakeDomHelper = {
-    createScriptSrc: function (s) {
-      script = { src: s };
+    createElement: function () {
+      script = {
+        addEventListener: function () {}
+      };
       return script;
     },
     insertInto: function (tag, elem) {

data/src/core/useragentparser.js

@@ -13,6 +13,16 @@ webfont.UserAgentParser = function(userAgent, doc) {
  */
 webfont.UserAgentParser.UNKNOWN = "Unknown";
 
+/**
+ * A constant for identifying a generic browser on a mobile platform that
+ * doesn't really have a name, but just came with the platform. Usually these
+ * are WebKit based, and examples are the default browser app on Android and
+ * the default browser app on BlackBerry 10.
+ * @const
+ * @type {string}
+ */
+webfont.UserAgentParser.BUILTIN_BROWSER = "BuiltinBrowser";
+
 /**
  * @const
  * @type {webfont.UserAgent}
@@ -50,9 +60,12 @@ webfont.UserAgentParser.prototype.parse = function() {
  */
 webfont.UserAgentParser.prototype.getPlatform_ = function() {
   var mobileOs = this.getMatchingGroup_(this.userAgent_,
-      /(iPod|iPad|iPhone|Android|Windows Phone)/, 1);
+      /(iPod|iPad|iPhone|Android|Windows Phone|BB\d{2}|BlackBerry)/, 1);
 
   if (mobileOs != "") {
+    if (/BB\d{2}/.test(mobileOs)) {
+      mobileOs = "BlackBerry";
+    }
     return mobileOs;
   }
   var os = this.getMatchingGroup_(this.userAgent_,
@@ -91,6 +104,11 @@ webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
   if (linuxVersion) {
     return linuxVersion;
   }
+  var blackBerryVersion = this.getMatchingGroup_(this.userAgent_,
+      /(BB\d{2}|BlackBerry).*?Version\/([^\s]*)/, 2);
+  if (blackBerryVersion) {
+    return blackBerryVersion;
+  }
 
   return webfont.UserAgentParser.UNKNOWN;
 };
@@ -224,6 +242,8 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
 
   if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1 || this.userAgent_.indexOf("CriOS") != -1) {
     name = "Chrome";
+  } else if (platform == "BlackBerry" || platform == "Android") {
+    name = webfont.UserAgentParser.BUILTIN_BROWSER;
   } else if (this.userAgent_.indexOf("Safari") != -1) {
     name = "Safari";
   } else if (this.userAgent_.indexOf("AdobeAIR") != -1) {
@@ -231,7 +251,9 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
   }
   var version = webfont.UserAgentParser.UNKNOWN;
 
-  if (this.userAgent_.indexOf("Version/") != -1) {
+  if (name == webfont.UserAgentParser.BUILTIN_BROWSER) {
+    version = webfont.UserAgentParser.UNKNOWN;
+  } else if (this.userAgent_.indexOf("Version/") != -1) {
     version = this.getMatchingGroup_(this.userAgent_,
         /Version\/([\d\.\w]+)/, 1);
   } else if (name == "Chrome") {
@@ -246,6 +268,10 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
     var minor = this.getMatchingGroup_(version, /\d+\.(\d+)/, 1);
     supportWebFont = this.getMajorVersion_(version) > 2 ||
       this.getMajorVersion_(version) == 2 && parseInt(minor, 10) >= 5;
+  } else if (platform == "BlackBerry") {
+    supportWebFont = parseInt(platformVersion, 10) >= 10;
+  } else if (platform == "Android") {
+    supportWebFont = parseFloat(platformVersion) > 2.1;
   } else {
     var minor = this.getMatchingGroup_(webKitVersion, /\d+\.(\d+)/, 1);
     supportWebFont = this.getMajorVersion_(webKitVersion) >= 526 ||

data/src/monotype/monotype_script.js

@@ -40,18 +40,12 @@ webfont.MonotypeScript.prototype.supportUserAgent = function (userAgent, support
   var self = this;
   var projectId = self.configuration_['projectId'];
   if (projectId) {
-    var sc = self.domHelper_.createScriptSrc(self.getScriptSrc(projectId));
+    var sc = self.domHelper_.createElement("script");
     sc["id"] = webfont.MonotypeScript.SCRIPTID + projectId;
 
-    sc["onreadystatechange"] = function (e) {
-      if (sc["readyState"] === "loaded" || sc["readyState"] === "complete") {
-        sc["onreadystatechange"] = null;
-        sc["onload"](e);
-      }
-    };
-
     var loadWindow = this.domHelper_.getLoadWindow();
-    sc["onload"] = function (e) {
+
+    function onload() {
       if (loadWindow[webfont.MonotypeScript.HOOK + projectId]) {
         var mti_fnts = loadWindow[webfont.MonotypeScript.HOOK + projectId]();
         if (mti_fnts && mti_fnts.length) {
@@ -62,8 +56,19 @@ webfont.MonotypeScript.prototype.supportUserAgent = function (userAgent, support
         }
       }
       support(userAgent.isSupportingWebFont());
+    }
+
+    var done = false;
+
+    sc["onload"] = sc["onreadystatechange"] = function () {
+      if (!done && (!this["readyState"] || this["readyState"] === "loaded" || this["readyState"] === "complete")) {
+        done = true;
+        onload();
+        sc["onload"] = sc["onreadystatechange"] = null;
+      }
     };
 
+    sc["src"] = self.getScriptSrc(projectId);
     this.domHelper_.insertInto('head', sc);
   }
   else {

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.1.0'
-  s.date              = '2012-12-05'
+  s.version           = '1.1.1'
+  s.date              = '2012-12-12'
 
   ## 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: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-05 00:00:00 Z
+date: 2012-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false