webfontloader 1.3.0 → 1.3.1

data/spec/deps.js

@@ -0,0 +1,27 @@
+// This file was autogenerated by calcdeps.js
+goog.addDependency("../../src/ascender/ascender_script.js", ["webfont.AscenderScript"], []);
+goog.addDependency("../../src/async_load.js", [], []);
+goog.addDependency("../../src/closure.js", [], []);
+goog.addDependency("../../src/core/browserinfo.js", ["webfont.BrowserInfo"], []);
+goog.addDependency("../../src/core/cssclassname.js", ["webfont.CssClassName"], []);
+goog.addDependency("../../src/core/cssfontfamilyname.js", ["webfont.CssFontFamilyName"], []);
+goog.addDependency("../../src/core/domhelper.js", ["webfont.DomHelper"], []);
+goog.addDependency("../../src/core/eventdispatcher.js", ["webfont.EventDispatcher"], ["webfont.CssClassName"]);
+goog.addDependency("../../src/core/font.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher","webfont.Size"]);
+goog.addDependency("../../src/core/fontmoduleloader.js", ["webfont.FontModuleLoader"], []);
+goog.addDependency("../../src/core/fontruler.js", ["webfont.FontRuler"], ["webfont.CssFontFamilyName","webfont.FontVariationDescription","webfont.Size"]);
+goog.addDependency("../../src/core/fontvariationdescription.js", ["webfont.FontVariationDescription"], []);
+goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["webfont.FontWatchRunner"]);
+goog.addDependency("../../src/core/fontwatchrunner.js", ["webfont.FontWatchRunner"], ["webfont.FontRuler"]);
+goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.UserAgentParser","webfont.FontModuleLoader","webfont.WebFont"]);
+goog.addDependency("../../src/core/size.js", ["webfont.Size"], []);
+goog.addDependency("../../src/core/useragent.js", ["webfont.UserAgent"], []);
+goog.addDependency("../../src/core/useragentparser.js", ["webfont.UserAgentParser"], ["webfont.BrowserInfo","webfont.UserAgent"]);
+goog.addDependency("../../src/custom/customcss.js", ["webfont.CustomCss"], []);
+goog.addDependency("../../src/fontdeck/fontdeck_script.js", ["webfont.FontdeckScript"], ["webfont.FontVariationDescription"]);
+goog.addDependency("../../src/google/fontapiparser.js", ["webfont.FontApiParser"], ["webfont.FontVariationDescription"]);
+goog.addDependency("../../src/google/fontapiurlbuilder.js", ["webfont.FontApiUrlBuilder"], []);
+goog.addDependency("../../src/google/googlefontapi.js", ["webfont.GoogleFontApi"], ["webfont.FontApiUrlBuilder","webfont.FontApiParser","webfont.FontWatchRunner","webfont.LastResortWebKitFontWatchRunner"]);
+goog.addDependency("../../src/google/lastresortwebkitfontwatchrunner.js", ["webfont.LastResortWebKitFontWatchRunner"], ["webfont.FontRuler"]);
+goog.addDependency("../../src/monotype/monotype_script.js", ["webfont.MonotypeScript"], []);
+goog.addDependency("../../src/typekit/typekit_script.js", ["webfont.TypekitScript"], []);

data/spec/google/lastresortwebkitfontwatchrunner_spec.js

@@ -3,12 +3,12 @@ describe('LastResortWebKitFontWatchRunner', function () {
       BrowserInfo = webfont.BrowserInfo,
       Size = webfont.Size,
       DomHelper = webfont.DomHelper,
+      FontRuler = webfont.FontRuler,
       domHelper = new DomHelper(window),
       fontFamily = 'My Family',
       fontDescription = 'n4';
 
-  var timesToCheckSizeBeforeChange = 0,
-      TARGET_SIZE = new Size(3, 3),
+  var TARGET_SIZE = new Size(3, 3),
       FALLBACK_SIZE_A = new Size(1, 1),
       FALLBACK_SIZE_B = new Size(2, 2),
       LAST_RESORT_SIZE = new Size(4, 4),
@@ -16,67 +16,56 @@ describe('LastResortWebKitFontWatchRunner', function () {
       browserInfo = new BrowserInfo(true, true, false),
       setupSizes = [FALLBACK_SIZE_A, FALLBACK_SIZE_B, LAST_RESORT_SIZE],
       actualSizes = [],
-      fakeGetSizeCount = 0,
-      setupFinished = false,
-      fakeFontSizer = {
-        getSize: function (el) {
-          var result = null;
-
-          if (setupFinished) {
-            // If you are getting an exception here your tests does not specify enough
-            // size data to run properly.
-            if (fakeGetSizeCount >= actualSizes.length) {
-              throw 'Invalid test data';
-            }
-            result = actualSizes[fakeGetSizeCount];
-            fakeGetSizeCount += 1;
-          } else {
-            result = setupSizes[Math.min(fakeGetSizeCount, setupSizes.length - 1)];
-            fakeGetSizeCount += 1;
-          }
-          return result;
-        }
-      },
       timesToGetTimeBeforeTimeout = 10,
-      fakeGetTime = function () {
-        if (timesToGetTimeBeforeTimeout <= 0) {
-          return 6000;
-        } else {
-          timesToGetTimeBeforeTimeout -= 1;
-          return 1;
-        }
-      },
-      asyncCount = 0,
-      fakeAsyncCall = function (func, timeout) {
-        asyncCount += 1;
-        func();
-      },
-      setupFinished = false,
-      originalStartMethod = null,
       activeCallback = null,
       inactiveCallback = null;
 
   beforeEach(function () {
+    jasmine.Clock.useMock();
+
     actualSizes = [];
-    setupFinished = false;
-    fakeGetSizeCount = 0;
 
-    asyncCount = 0;
-    timesToGetTimeBeforeTimeout = 10;
     activeCallback = jasmine.createSpy('activeCallback');
     inactiveCallback = jasmine.createSpy('inactiveCallback');
+    timesToGetTimeBeforeTimeout = 10;
 
-    originalStartMethod = LastResortWebKitFontWatchRunner.prototype.start;
+    var setupFinished = false,
+        fakeGetSizeCount = 0;
 
-    LastResortWebKitFontWatchRunner.prototype.start = function () {
+    spyOn(FontRuler.prototype, 'getSize').andCallFake(function () {
+      var result = null;
+
+      if (setupFinished) {
+        // If you are getting an exception here your tests does not specify enough
+        // size data to run properly.
+        if (fakeGetSizeCount >= actualSizes.length) {
+          throw 'Invalid test data';
+        }
+        result = actualSizes[fakeGetSizeCount];
+        fakeGetSizeCount += 1;
+      } else {
+        result = setupSizes[Math.min(fakeGetSizeCount, setupSizes.length - 1)];
+        fakeGetSizeCount += 1;
+      }
+      return result;
+    });
+
+    spyOn(goog, 'now').andCallFake(function () {
+      if (timesToGetTimeBeforeTimeout <= 0) {
+        return 6000;
+      } else {
+        timesToGetTimeBeforeTimeout -= 1;
+        return 1;
+      }
+    });
+
+    var originalStart = LastResortWebKitFontWatchRunner.prototype.start;
+
+    spyOn(LastResortWebKitFontWatchRunner.prototype, 'start').andCallFake(function () {
       setupFinished = true;
       fakeGetSizeCount = 0;
-      originalStartMethod.apply(this);
-    };
-  });
-
-  afterEach(function () {
-    LastResortWebKitFontWatchRunner.prototype.start = originalStartMethod;
+      originalStart.apply(this);
+    });
   });
 
   it('should ignore fallback size and call active', function () {
@@ -86,11 +75,11 @@ describe('LastResortWebKitFontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
+        domHelper, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
-    expect(asyncCount).toEqual(1);
+    jasmine.Clock.tick(1 * 25);
     expect(activeCallback).toHaveBeenCalledWith('My Family', 'n4');
   });
 
@@ -103,11 +92,11 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 2;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, 'Arimo', fontDescription, browserInfo);
+        domHelper, 'Arimo', fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
-    expect(asyncCount).toEqual(1);
+    jasmine.Clock.tick(1 * 25);
     expect(activeCallback).toHaveBeenCalledWith('Arimo', 'n4');
   });
 
@@ -121,11 +110,11 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 3;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
+        domHelper, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
-    expect(asyncCount).toEqual(2);
+    jasmine.Clock.tick(2 * 25);
     expect(inactiveCallback).toHaveBeenCalledWith('My Family', 'n4');
   });
 
@@ -138,10 +127,10 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 2;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
+        domHelper, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
-    expect(asyncCount).toEqual(1);
+    jasmine.Clock.tick(1 * 25);
     expect(inactiveCallback).toHaveBeenCalledWith('My Family', 'n4');
   });
 });

data/spec/index.html

@@ -14,32 +14,21 @@
     <script src="../tools/jasmine/jasmine.js"></script>
     <script src="../tools/jasmine/jasmine-html.js"></script>
     <script src="../tools/jasmine-phantomjs/terminal-reporter.js"></script>
+    <script src="../tools/compiler/base.js"></script>
+    <script src="../spec/deps.js"></script>
 
-    <script src="../src/core/namespace.js"></script>
-    <script src="../src/core/domhelper.js"></script>
-    <script src="../src/core/cssclassname.js"></script>
-    <script src="../src/core/cssfontfamilyname.js"></script>
-    <script src="../src/core/fontvariationdescription.js"></script>
-    <script src="../src/core/browserinfo.js"></script>
-    <script src="../src/core/useragent.js"></script>
-    <script src="../src/core/useragentparser.js"></script>
-    <script src="../src/core/fontmoduleloader.js"></script>
-    <script src="../src/core/eventdispatcher.js"></script>
-    <script src="../src/core/size.js"></script>
-    <script src="../src/core/fontruler.js"></script>
-    <script src="../src/core/fontwatchrunner.js"></script>
-    <script src="../src/core/fontwatcher.js"></script>
-    <script src="../src/core/font.js"></script>
-    <script src="../src/core/initialize.js"></script>
-    <script src="../src/google/fontapiparser.js"></script>
-    <script src="../src/google/fontapiurlbuilder.js"></script>
-    <script src="../src/google/googlefontapi.js"></script>
-    <script src="../src/google/lastresortwebkitfontwatchrunner.js"></script>
-    <script src="../src/custom/customcss.js"></script>
-    <script src="../src/ascender/ascender_script.js"></script>
-    <script src="../src/fontdeck/fontdeck_script.js"></script>
-    <script src="../src/monotype/monotype_script.js"></script>
-    <script src="../src/typekit/typekit_script.js"></script>
+    <script>
+      goog.require('webfont');
+
+      // Require the modules because they don't have an explicit
+      // dependency on core.
+      goog.require('webfont.TypekitScript');
+      goog.require('webfont.AscenderScript');
+      goog.require('webfont.FontdeckScript');
+      goog.require('webfont.MonotypeScript');
+      goog.require('webfont.CustomCss');
+      goog.require('webfont.GoogleFontApi');
+    </script>
 
     <script src="../spec/core/domhelper_spec.js"></script>
     <script src="../spec/core/cssclassname_spec.js"></script>

data/src/ascender/ascender_script.js

@@ -1,3 +1,5 @@
+goog.provide('webfont.AscenderScript');
+
 /**
  *
  * WebFont.load({
@@ -8,6 +10,7 @@
  * });
  *
  * @constructor
+ * @implements {webfont.FontModule}
  */
 webfont.AscenderScript = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
@@ -27,56 +30,60 @@ webfont.AscenderScript.VARIATIONS = {
   'bi': 'i7'
 };
 
-webfont.AscenderScript.prototype.supportUserAgent = function(userAgent, support) {
-  return support(userAgent.getBrowserInfo().hasWebFontSupport());
-};
+goog.scope(function () {
+  var AscenderScript = webfont.AscenderScript;
 
-webfont.AscenderScript.prototype.load = function(onReady) {
-  var key = this.configuration_['key'];
-  var protocol = this.domHelper_.getProtocol();
-  var url = protocol + '//webfonts.fontslive.com/css/' + key + '.css';
-  this.domHelper_.insertInto('head', this.domHelper_.createCssLink(url));
-  var fv = this.parseFamiliesAndVariations(this.configuration_['families']);
-  onReady(fv.families, fv.variations);
-};
+  AscenderScript.prototype.supportUserAgent = function(userAgent, support) {
+    return support(userAgent.getBrowserInfo().hasWebFontSupport());
+  };
 
-webfont.AscenderScript.prototype.parseFamiliesAndVariations = function(providedFamilies){
-  var families, variations, fv;
-  families = [];
-  variations = {};
-  for(var i = 0, len = providedFamilies.length; i < len; i++){
-    fv = this.parseFamilyAndVariations(providedFamilies[i]);
-    families.push(fv.family);
-    variations[fv.family] = fv.variations;
-  }
-  return { families:families, variations:variations };
-};
+  AscenderScript.prototype.load = function(onReady) {
+    var key = this.configuration_['key'];
+    var protocol = this.domHelper_.getProtocol();
+    var url = protocol + '//webfonts.fontslive.com/css/' + key + '.css';
+    this.domHelper_.insertInto('head', this.domHelper_.createCssLink(url));
+    var fv = this.parseFamiliesAndVariations(this.configuration_['families']);
+    onReady(fv.families, fv.variations);
+  };
 
-webfont.AscenderScript.prototype.parseFamilyAndVariations = function(providedFamily){
-  var family, variations, parts;
-  parts = providedFamily.split(':');
-  family = parts[0];
-  variations = [];
-  if(parts[1]){
-    variations = this.parseVariations(parts[1]);
-  }else{
-    variations = ['n4'];
-  }
-  return { family:family, variations:variations };
-};
+  AscenderScript.prototype.parseFamiliesAndVariations = function(providedFamilies){
+    var families, variations, fv;
+    families = [];
+    variations = {};
+    for(var i = 0, len = providedFamilies.length; i < len; i++){
+      fv = this.parseFamilyAndVariations(providedFamilies[i]);
+      families.push(fv.family);
+      variations[fv.family] = fv.variations;
+    }
+    return { families:families, variations:variations };
+  };
 
-webfont.AscenderScript.prototype.parseVariations = function(source){
-  var providedVariations = source.split(',');
-  var variations = [];
-  for(var i = 0, len = providedVariations.length; i < len; i++){
-    var pv = providedVariations[i];
-    if(pv){
-      var v = webfont.AscenderScript.VARIATIONS[pv];
-      variations.push(v ? v : pv);
+  AscenderScript.prototype.parseFamilyAndVariations = function(providedFamily){
+    var family, variations, parts;
+    parts = providedFamily.split(':');
+    family = parts[0];
+    variations = [];
+    if(parts[1]){
+      variations = this.parseVariations(parts[1]);
+    }else{
+      variations = ['n4'];
     }
-  }
-  return variations;
-};
+    return { family:family, variations:variations };
+  };
+
+  AscenderScript.prototype.parseVariations = function(source){
+    var providedVariations = source.split(',');
+    var variations = [];
+    for(var i = 0, len = providedVariations.length; i < len; i++){
+      var pv = providedVariations[i];
+      if(pv){
+        var v = AscenderScript.VARIATIONS[pv];
+        variations.push(v ? v : pv);
+      }
+    }
+    return variations;
+  };
+});
 
 globalNamespaceObject.addModule(webfont.AscenderScript.NAME, function(configuration, domHelper) {
   return new webfont.AscenderScript(domHelper, configuration);

data/src/core/browserinfo.js

@@ -1,4 +1,7 @@
+goog.provide('webfont.BrowserInfo');
+
 /**
+ * @export
  * @constructor
  * @param {boolean} webfontSupport
  * @param {boolean} webKitFallbackBug
@@ -10,52 +13,56 @@ webfont.BrowserInfo = function (webfontSupport, webKitFallbackBug, webKitMetrics
   this.webKitMetricsBug_ = webKitMetricsBug;
 };
 
-/**
- * Returns true if the browser supports web fonts.
- *
- * @return {boolean}
- */
-webfont.BrowserInfo.prototype.hasWebFontSupport = function () {
-  return this.webfontSupport_;
-};
+goog.scope(function () {
+  var BrowserInfo = webfont.BrowserInfo;
 
-/**
- * Returns true if the browser has the WebKit fallback bug.
- *
- * The bug causes the normal CSS font stack to be ignored while
- * loading web fonts. Instead it picks the generic font family
- * (or the default generic font family) of the first instance
- * the web font is mentioned in CSS. It switches to this font
- * immediately while loading web font, causing two changes in
- * font to occur (compared to other browsers which only change
- * font once the web font has loaded.)
- *
- * The bug has been fixed and is only happens in WebKit versions
- * below 536.11. Even though it is fixed we still have a large
- * percentage of users on older WebKit versions, mostly on mobile
- * platforms.
- *
- * Also see: https://bugs.webkit.org/show_bug.cgi?id=76684
- *
- * @return {boolean}
- */
-webfont.BrowserInfo.prototype.hasWebKitFallbackBug = function () {
-  return this.webKitFallbackBug_;
-};
+  /**
+   * Returns true if the browser supports web fonts.
+   *
+   * @return {boolean}
+   */
+  BrowserInfo.prototype.hasWebFontSupport = function () {
+    return this.webfontSupport_;
+  };
 
-/**
- * Returns true if the browser has the WebKit metrics bug
- *
- * The metrics bug causes WebKit to change the height of a font
- * while loading a web font. Other browsers do not modify
- * the width or height of the fallback font while a web font is
- * loading. This caused our width and height check to be incorrect,
- * triggering a false positive.
- *
- * Also see: https://bugs.webkit.org/show_bug.cgi?id=110977
- *
- * @return {boolean}
- */
-webfont.BrowserInfo.prototype.hasWebKitMetricsBug = function () {
-  return this.webKitMetricsBug_;
-};
+  /**
+   * Returns true if the browser has the WebKit fallback bug.
+   *
+   * The bug causes the normal CSS font stack to be ignored while
+   * loading web fonts. Instead it picks the generic font family
+   * (or the default generic font family) of the first instance
+   * the web font is mentioned in CSS. It switches to this font
+   * immediately while loading web font, causing two changes in
+   * font to occur (compared to other browsers which only change
+   * font once the web font has loaded.)
+   *
+   * The bug has been fixed and is only happens in WebKit versions
+   * below 536.11. Even though it is fixed we still have a large
+   * percentage of users on older WebKit versions, mostly on mobile
+   * platforms.
+   *
+   * Also see: https://bugs.webkit.org/show_bug.cgi?id=76684
+   *
+   * @return {boolean}
+   */
+  BrowserInfo.prototype.hasWebKitFallbackBug = function () {
+    return this.webKitFallbackBug_;
+  };
+
+  /**
+   * Returns true if the browser has the WebKit metrics bug
+   *
+   * The metrics bug causes WebKit to change the height of a font
+   * while loading a web font. Other browsers do not modify
+   * the width or height of the fallback font while a web font is
+   * loading. This caused our width and height check to be incorrect,
+   * triggering a false positive.
+   *
+   * Also see: https://bugs.webkit.org/show_bug.cgi?id=110977
+   *
+   * @return {boolean}
+   */
+  BrowserInfo.prototype.hasWebKitMetricsBug = function () {
+    return this.webKitMetricsBug_;
+  };
+});