webfontloader 1.0.13 → 1.0.15

data/CHANGELOG

@@ -1,4 +1,8 @@
-master
+v1.0.15 (October 14, 2010)
+* Fix an error parsing platform version in IE, when it has no items following the platform in the UA string.
+
+v1.0.14 (October 14, 2010)
+* Bugfix: fixed IE issue in google module.
 
 v1.0.13 (September 30, 2010)
 * Added support for detecting Adobe Air.

data/lib/webfontloader.rb

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

data/src-test/core/useragenttest.js

@@ -116,6 +116,22 @@ UserAgentTest.prototype.testBrowserIsIE = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsIEMinimal = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("MSIE", userAgent.getName());
+  assertEquals("7.0", userAgent.getVersion());
+  assertEquals("Windows", userAgent.getPlatform());
+  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",

data/src/core/fontwatcher.js

@@ -31,7 +31,9 @@ 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.
+ *     of each family to watch. Described with FVD.
+ * @param {Object.<string, string>} fontTestStrings The font test strings for
+ *     each family.
  * @param {boolean} last True if this is the last set of families to watch.
  */
 webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,

data/src/core/useragentparser.js

@@ -72,7 +72,7 @@ webfont.UserAgentParser.prototype.getPlatform_ = function() {
  */
 webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
   var macVersion = this.getMatchingGroup_(this.userAgent_,
-      /(OS X|Windows NT|Android) ([^;]+)/, 2);
+      /(OS X|Windows NT|Android) ([^;)]+)/, 2);
   if (macVersion) {
     return macVersion;
   }

data/src/google/googlefontapi.js

@@ -17,27 +17,29 @@ webfont.GoogleFontApi.prototype.supportUserAgent = function(userAgent, support)
 };
 
 webfont.GoogleFontApi.prototype.load = function(onReady) {
-  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(
-      this.configuration_['api']);
-  var fontFamilies = this.configuration_['families'];
   var domHelper = this.domHelper_;
   var nonBlockingIe = this.userAgent_.getName() == 'MSIE' &&
       this.configuration_['blocking'] != true;
 
-  fontApiUrlBuilder.setFontFamilies(fontFamilies);
-
   if (nonBlockingIe) {
-    domHelper.whenBodyExists(function() {
-      domHelper.insertInto('head', domHelper.createCssLink(
-          fontApiUrlBuilder.build()));
-    });
+    domHelper.whenBodyExists(webfont.bind(this, this.insertLink_, onReady));
   } else {
-    domHelper.insertInto('head', domHelper.createCssLink(
-        fontApiUrlBuilder.build()));
+    this.insertLink_(onReady);
   }
-  var fontApiParser = new webfont.FontApiParser(fontFamilies);
+};
 
+webfont.GoogleFontApi.prototype.insertLink_ = function(onReady) {
+  var domHelper = this.domHelper_;
+  var fontApiUrlBuilder = new webfont.FontApiUrlBuilder(
+      this.configuration_['api']);
+  var fontFamilies = this.configuration_['families'];
+  fontApiUrlBuilder.setFontFamilies(fontFamilies);
+
+  var fontApiParser = new webfont.FontApiParser(fontFamilies);
   fontApiParser.parse();
+
+  domHelper.insertInto('head', domHelper.createCssLink(
+      fontApiUrlBuilder.build()));
   onReady(fontApiParser.getFontFamilies(), fontApiParser.getVariations(),
       fontApiParser.getFontTestStrings());
 };

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.13'
-  s.date              = '2010-09-30'
+  s.version           = '1.0.15'
+  s.date              = '2010-10-20'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 13
-  version: 1.0.13
+  - 15
+  version: 1.0.15
 platform: ruby
 authors: 
 - Ryan Carver
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 -07:00
+date: 2010-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency