webfontloader 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.4.2 (April 11, 2013)
+* Namespace is now configurable at compile time
+* BrowserInfo and UserAgent are exported so Typekit KitJS and the standalone webfontloader can share data
+* Add "aria-hidden=true" to test spans so screen readers do not read test spans
+* Fix passing the test strings from the modules to core.
+
 v1.4.1 (April 8, 2013)
 * Internal rewrite of font and variations
 * Fix for the configurable timeout on the Google module

data/README.md

@@ -171,6 +171,6 @@ WebFont Loader is released under the [Apache 2.0][lic] license.
 [evt]: http://github.com/typekit/webfontloader/blob/master/docs/EVENTS.md
 [lic]: http://github.com/typekit/webfontloader/blob/master/LICENSE
 [demos]: http://github.com/typekit/webfontloader/blob/master/lib/webfontloader/demo/public
-[gfontapi]: https://code.google.com/apis/webfonts/
-[gajax]: http://code.google.com/apis/ajaxlibs/
+[gfontapi]: https://developers.google.com/fonts/
+[gajax]: https://developers.google.com/speed/libraries/
 [issues]: https://github.com/typekit/webfontloader/issues

data/lib/webfontloader.rb

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

data/spec/core/fontwatchrunner_spec.js

@@ -258,6 +258,8 @@ describe('FontWatchRunner', function () {
         nullFont = null,
         sourceSansA = null,
         sourceSansB = null,
+        sourceSansC = null,
+        sourceSansCBold = null,
         elena = null;
 
     beforeEach(function () {
@@ -266,6 +268,8 @@ describe('FontWatchRunner', function () {
       nullFont = new Font('__webfontloader_test__');
       sourceSansA = new Font('SourceSansA');
       sourceSansB = new Font('SourceSansB');
+      sourceSansC = new Font('SourceSansC');
+      sourceSansCBold = new Font('SourceSansC', 'n7');
       elena = new Font('Elena');
 
       userAgent = userAgentParser.parse();
@@ -397,15 +401,15 @@ describe('FontWatchRunner', function () {
 
     it('should load one weight after another', function () {
        var fontWatchRunnerRegular = new FontWatchRunner(activeCallback, inactiveCallback,
-           domHelper, 'SourceSansC', 'n4', userAgent.getBrowserInfo(), 500),
+           domHelper, sourceSansC, userAgent.getBrowserInfo(), 500),
            fontWatchRunnerBold = new FontWatchRunner(activeCallback, inactiveCallback,
-           domHelper, 'SourceSansC', 'n7', userAgent.getBrowserInfo(), 500),
+           domHelper, sourceSansCBold, userAgent.getBrowserInfo(), 500),
            fontRulerA = new FontRuler(domHelper, 'abcdef'),
            fontRulerB = new FontRuler(domHelper, 'abcdef');
 
       runs(function () {
         fontRulerA.insert();
-        fontRulerA.setFont('SourceSansC', 'n4');
+        fontRulerA.setFont(sourceSansC);
         fontWatchRunnerRegular.start();
       });
 
@@ -414,13 +418,13 @@ describe('FontWatchRunner', function () {
       });
 
       runs(function () {
-        expect(activeCallback).toHaveBeenCalledWith('SourceSansC', 'n4');
+        expect(activeCallback).toHaveBeenCalledWith(sourceSansC);
 
         activeCallback.reset();
         inactiveCallback.reset();
 
         fontRulerB.insert();
-        fontRulerB.setFont('SourceSansC', 'n7');
+        fontRulerB.setFont(sourceSansCBold);
         fontWatchRunnerBold.start();
       });
 
@@ -429,8 +433,8 @@ describe('FontWatchRunner', function () {
       });
 
       runs(function () {
-        expect(activeCallback).toHaveBeenCalledWith('SourceSansC', 'n7');
-        expect(fontRulerA.getSize()).not.toEqual(fontRulerB.getSize());
+        expect(activeCallback).toHaveBeenCalledWith(sourceSansCBold);
+        expect(fontRulerA.getWidth()).not.toEqual(fontRulerB.getWidth());
       });
     });
   });

data/spec/core/webfont_spec.js

@@ -191,6 +191,38 @@ describe('WebFont', function () {
     });
   });
 
+  describe('should pass both fonts and test strings to onready', function () {
+    var font = null,
+        fontTestStrings = null,
+        testModule = null;
+
+    beforeEach(function () {
+      font = new WebFont(window, fontModuleLoader, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false)));
+
+      font.addModule('test', function (conf, domHelper) {
+        testModule = new function () {};
+        testModule.supportUserAgent = function (ua, support) { support(true); };
+        testModule.load = function (onReady) {
+          onReady([new Font('Elena')], { 'Elena': '1234567' });
+        };
+
+        return testModule;
+      });
+
+      spyOn(font, 'onModuleReady_');
+    });
+
+    it('should have called onModuleReady with the correct font and test string', function () {
+      font.load({
+        'test': {}
+      });
+
+      expect(font.onModuleReady_).toHaveBeenCalled();
+      expect(font.onModuleReady_.calls[0].args[3]).toEqual([new Font('Elena')]);
+      expect(font.onModuleReady_.calls[0].args[4]).toEqual({ 'Elena': '1234567' });
+    });
+  });
+
   describe('font inactive', function () {
     var font = null,
         testModule = null;

data/src/core/browserinfo.js

@@ -1,6 +1,7 @@
 goog.provide('webfont.BrowserInfo');
 
 /**
+ * @export
  * @constructor
  * @param {boolean} webfontSupport
  * @param {boolean} webKitFallbackBug
@@ -16,6 +17,7 @@ goog.scope(function () {
   var BrowserInfo = webfont.BrowserInfo;
 
   /**
+   * @export
    * Returns true if the browser supports web fonts.
    *
    * @return {boolean}
@@ -25,6 +27,8 @@ goog.scope(function () {
   };
 
   /**
+   * @export
+   *
    * Returns true if the browser has the WebKit fallback bug.
    *
    * The bug causes the normal CSS font stack to be ignored while
@@ -49,6 +53,8 @@ goog.scope(function () {
   };
 
   /**
+   * @export
+   *
    * Returns true if the browser has the WebKit metrics bug
    *
    * The metrics bug causes WebKit to change the height of a font

data/src/core/fontruler.js

@@ -10,7 +10,9 @@ goog.provide('webfont.FontRuler');
 webfont.FontRuler = function (domHelper, fontTestString) {
   this.domHelper_ = domHelper;
   this.fontTestString_ = fontTestString;
-  this.el_ = this.domHelper_.createElement('span', {}, this.fontTestString_);
+  this.el_ = this.domHelper_.createElement('span', {
+    "aria-hidden": "true"
+  }, this.fontTestString_);
 };
 
 goog.scope(function () {

data/src/core/initialize.js

@@ -9,11 +9,15 @@ goog.require('webfont.WebFont');
  */
 webfont.FontTestStrings;
 
-// Name of the global object.
-var globalName = 'WebFont';
+/**
+ * Name of the global object
+ *
+ * @define {string}
+ */
+var GLOBAL_NAME = 'WebFont';
 
 // Provide an instance of WebFont in the global namespace.
-var globalNamespaceObject = window[globalName] = (function() {
+var globalNamespaceObject = window[GLOBAL_NAME] = (function() {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
   var fontModuleLoader = new webfont.FontModuleLoader();

data/src/core/useragent.js

@@ -1,6 +1,7 @@
 goog.provide('webfont.UserAgent');
 
 /**
+ * @export
  * @param {string} name
  * @param {string} version
  * @param {string} engine
@@ -27,6 +28,7 @@ goog.scope(function () {
   var UserAgent = webfont.UserAgent;
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getName = function() {
@@ -34,6 +36,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getVersion = function() {
@@ -41,6 +44,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getEngine = function() {
@@ -48,6 +52,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getEngineVersion = function() {
@@ -55,6 +60,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getPlatform = function() {
@@ -62,6 +68,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {string}
    */
   UserAgent.prototype.getPlatformVersion = function() {
@@ -69,6 +76,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {number|undefined}
    */
   UserAgent.prototype.getDocumentMode = function() {
@@ -76,6 +84,7 @@ goog.scope(function () {
   };
 
   /**
+   * @export
    * @return {webfont.BrowserInfo}
    */
   UserAgent.prototype.getBrowserInfo = function() {

data/src/core/webfont.js

@@ -77,8 +77,8 @@ goog.scope(function () {
       return;
     }
 
-    module.load(function (fonts) {
-      that.onModuleReady_(eventDispatcher, fontWatcher, fontWatchRunnerCtor, fonts);
+    module.load(function (fonts, opt_fontTestStrings) {
+      that.onModuleReady_(eventDispatcher, fontWatcher, fontWatchRunnerCtor, fonts, opt_fontTestStrings);
     });
   };
 

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.4.1'
-  s.date              = '2013-04-08'
+  s.version           = '1.4.2'
+  s.date              = '2013-04-11'
 
   ## 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: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
   - 4
-  - 1
-  version: 1.4.1
+  - 2
+  version: 1.4.2
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-08 00:00:00 Z
+date: 2013-04-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake