webfontloader 1.5.21 → 1.6.0

data/spec/deps.js

@@ -1,6 +1,5 @@
 // This file was autogenerated by calcdeps.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/domhelper.js", ["webfont.DomHelper"], []);
 goog.addDependency("../../src/core/eventdispatcher.js", ["webfont.EventDispatcher"], ["webfont.CssClassName"]);
@@ -12,10 +11,7 @@ goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["w
 goog.addDependency("../../src/core/fontwatchrunner.js", ["webfont.FontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
 goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.WebFont","webfont.modules.Typekit","webfont.modules.Fontdeck","webfont.modules.Monotype","webfont.modules.Custom","webfont.modules.google.GoogleFontApi"]);
 goog.addDependency("../../src/core/nativefontwatchrunner.js", ["webfont.NativeFontWatchRunner"], ["webfont.Font"]);
-goog.addDependency("../../src/core/useragent.js", ["webfont.UserAgent"], []);
-goog.addDependency("../../src/core/useragentparser.js", ["webfont.UserAgentParser"], ["webfont.BrowserInfo","webfont.UserAgent","webfont.Version"]);
-goog.addDependency("../../src/core/version.js", ["webfont.Version"], []);
-goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher","webfont.FontModuleLoader","webfont.UserAgentParser"]);
+goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher","webfont.FontModuleLoader"]);
 goog.addDependency("../../src/modules/custom.js", ["webfont.modules.Custom"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/fontdeck.js", ["webfont.modules.Fontdeck"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/google/fontapiparser.js", ["webfont.modules.google.FontApiParser"], ["webfont.Font"]);

data/spec/index.html

@@ -29,7 +29,6 @@
 
     <script src="../spec/core/domhelper_spec.js"></script>
     <script src="../spec/core/cssclassname_spec.js"></script>
-    <script src="../spec/core/useragentparser_spec.js"></script>
     <script src="../spec/core/fontmoduleloader_spec.js"></script>
     <script src="../spec/core/eventdispatcher_spec.js"></script>
     <script src="../spec/core/font_spec.js"></script>
@@ -38,7 +37,6 @@
     <script src="../spec/core/nativefontwatchrunner_spec.js"></script>
     <script src="../spec/core/fontwatcher_spec.js"></script>
     <script src="../spec/core/webfont_spec.js"></script>
-    <script src="../spec/core/version_spec.js"></script>
     <script src="../spec/modules/google/fontapiparser_spec.js"></script>
     <script src="../spec/modules/google/fontapiurlbuilder_spec.js"></script>
     <script src="../spec/modules/google/googlefontapi_spec.js"></script>

data/spec/modules/fontdeck_spec.js

@@ -61,13 +61,11 @@ describe('modules.Fontdeck', function () {
 
   describe('support and load life cycle', function () {
     var fontdeck = null,
-        support = null;
+        onReady = jasmine.createSpy('onReady');
 
     beforeEach(function () {
       fontdeck = new Fontdeck(fakeDomHelper, configuration);
-      support = jasmine.createSpy('support');
-
-      fontdeck.supportUserAgent('user agent', support);
+      fontdeck.load(onReady);
     });
 
     it('should create the script correctly', function () {
@@ -84,8 +82,6 @@ describe('modules.Fontdeck', function () {
       global.__webfontfontdeckmodule__['2282'](true, apiResponse);
 
       expect(fontdeck.fonts_).toEqual([new Font(apiResponse.fonts[0].name), new Font(apiResponse.fonts[1].name, 'i7')]);
-
-      expect(support).toHaveBeenCalled();
     });
   });
 
@@ -95,14 +91,10 @@ describe('modules.Fontdeck', function () {
 
     beforeEach(function () {
       fontdeck = new Fontdeck(fakeDomHelper, { id: null });
-      support = jasmine.createSpy('support');
-
-      fontdeck.supportUserAgent('user agent', support);
     });
 
     it('should not have loaded any fonts', function () {
       expect(fontdeck.fonts_).toEqual([]);
-      expect(support).toHaveBeenCalled();
     });
   });
 });

data/spec/modules/monotype_spec.js

@@ -15,7 +15,6 @@ describe('modules.Monotype', function () {
       script = {},
       monotype = null,
       load =  null,
-      useragent = null,
       support = null;
 
   beforeEach(function () {
@@ -31,19 +30,8 @@ describe('modules.Monotype', function () {
     };
     support = jasmine.createSpy('support');
     load = jasmine.createSpy('load');
-    useragent = new UserAgent(
-      'Firefox',
-      new Version(3, 6),
-      'Gecko',
-      new Version(1, 9, 3),
-      'Macintosh',
-      new Version(10, 6),
-      undefined,
-      new BrowserInfo(true, false, false, false)
-    );
 
     monotype = new Monotype(fakeDomHelper, configuration);
-    monotype.supportUserAgent(useragent, support);
     monotype.load(load);
 
     global[Monotype.HOOK + configuration.projectId] = function () {
@@ -55,7 +43,6 @@ describe('modules.Monotype', function () {
 
 
   it('should create a script element', function () {
-    expect(support).toHaveBeenCalled();
     expect(fakeDomHelper.loadScript).toHaveBeenCalled();
     expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('http://fast.fonts.net/jsapidev/01e2ff27-25bf-4801-a23e-73d328e6c7cc.js');
     expect(load).toHaveBeenCalledWith([new Font('aachen bold'), new Font('kid print regular')]);

data/spec/modules/typekit_spec.js

@@ -9,7 +9,7 @@ describe('modules.Typekit', function () {
   var fakeDomHelper = null,
       global = {},
       load = null,
-      support = null;
+      onReady = null;
 
   beforeEach(function () {
     global = {
@@ -21,7 +21,7 @@ describe('modules.Typekit', function () {
       }
     };
 
-    support = jasmine.createSpy('support');
+    onReady = jasmine.createSpy('onReady');
 
     load = jasmine.createSpy('load');
 
@@ -37,11 +37,10 @@ describe('modules.Typekit', function () {
   it('should load with variations', function () {
     var typekit = new Typekit(fakeDomHelper, configuration);
 
-    typekit.supportUserAgent('useragent', support);
+    typekit.load(onReady);
 
     expect(fakeDomHelper.loadScript).toHaveBeenCalled();
-    expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('http://use.typekit.net/abc.js');
-    expect(support).toHaveBeenCalled();
+    expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('https://use.typekit.net/abc.js');
 
     expect(global.Typekit.load).toHaveBeenCalled();
     typekit.load(load);
@@ -52,7 +51,8 @@ describe('modules.Typekit', function () {
   it('should load through the alternative API', function () {
     var typekit = new Typekit(fakeDomHelper, { id: 'abc', api: '/test' });
 
-    typekit.supportUserAgent('useragent', support);
+    typekit.load(onReady);
+
     expect(fakeDomHelper.loadScript).toHaveBeenCalled();
     expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('/test/abc.js');
   });
@@ -60,10 +60,9 @@ describe('modules.Typekit', function () {
   it('should not load without a kit id', function () {
     var typekit = new Typekit(fakeDomHelper, { id: null });
 
-    typekit.supportUserAgent('useragent', support);
+    typekit.load(onReady);
 
     expect(fakeDomHelper.loadScript).not.toHaveBeenCalled();
-    expect(support).toHaveBeenCalled();
 
     typekit.load(load);
 

data/src/core/fontmodule.js

@@ -8,12 +8,6 @@ webfont.FontModule = function () {};
 goog.scope(function () {
   var FontModule = webfont.FontModule;
 
-  /**
-   * @param {webfont.UserAgent} userAgent
-   * @param {function(boolean)} support
-   */
-  FontModule.prototype.supportUserAgent = function (userAgent, support) {};
-
   /**
    * @param {function(Array.<webfont.Font>,  webfont.FontTestStrings=, Object.<string, boolean>=)} onReady
    */

data/src/core/fontwatcher.js

@@ -10,20 +10,17 @@ webfont.FontTestStrings;
 
 /**
  * @constructor
- * @param {webfont.UserAgent} userAgent
  * @param {webfont.DomHelper} domHelper
  * @param {webfont.EventDispatcher} eventDispatcher
  * @param {number=} opt_timeout
  */
-webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, opt_timeout) {
+webfont.FontWatcher = function(domHelper, eventDispatcher, opt_timeout) {
   this.domHelper_ = domHelper;
   this.eventDispatcher_ = eventDispatcher;
   this.currentlyWatched_ = 0;
   this.last_ = false;
   this.success_ = false;
   this.timeout_ = opt_timeout;
-
-  this.browserInfo_ = userAgent.getBrowserInfo();
 };
 
 goog.scope(function () {
@@ -74,7 +71,7 @@ goog.scope(function () {
       // stylesheet has loaded reliably). Until that issue is
       // resolved we'll keep the native font disabled.
       //
-      //if (this.browserInfo_.hasNativeFontLoading()) {
+      //if (window['FontFace']) {
       //  fontWatchRunner = new NativeFontWatchRunner(
       //      goog.bind(this.fontActive_, this),
       //      goog.bind(this.fontInactive_, this),
@@ -90,7 +87,6 @@ goog.scope(function () {
         goog.bind(this.fontInactive_, this),
         this.domHelper_,
         font,
-        this.browserInfo_,
         this.timeout_,
         metricCompatibleFonts,
         testString

data/src/core/fontwatchrunner.js

@@ -9,18 +9,16 @@ goog.require('webfont.FontRuler');
  * @param {function(webfont.Font)} inactiveCallback
  * @param {webfont.DomHelper} domHelper
  * @param {webfont.Font} font
- * @param {webfont.BrowserInfo} browserInfo
  * @param {number=} opt_timeout
  * @param {Object.<string, boolean>=} opt_metricCompatibleFonts
  * @param {string=} opt_fontTestString
  */
 webfont.FontWatchRunner = function(activeCallback, inactiveCallback, domHelper,
-    font, browserInfo, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
+    font, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
   this.activeCallback_ = activeCallback;
   this.inactiveCallback_ = inactiveCallback;
   this.domHelper_ = domHelper;
   this.font_ = font;
-  this.browserInfo_ = browserInfo;
   this.fontTestString_ = opt_fontTestString || webfont.FontWatchRunner.DEFAULT_TEST_STRING;
   this.lastResortWidths_ = {};
   this.timeout_ = opt_timeout || 3000;
@@ -58,6 +56,36 @@ goog.scope(function () {
       Font = webfont.Font,
       FontRuler = webfont.FontRuler;
 
+  /**
+   * @type {null|boolean}
+   */
+  FontWatchRunner.HAS_WEBKIT_FALLBACK_BUG = null;
+
+  /**
+   * @return {string}
+   */
+  FontWatchRunner.getUserAgent = function () {
+    return window.navigator.userAgent;
+  };
+
+  /**
+   * Returns true if this browser is WebKit and it has the fallback bug
+   * which is present in WebKit 536.11 and earlier.
+   *
+   * @return {boolean}
+   */
+  FontWatchRunner.hasWebKitFallbackBug = function () {
+    if (FontWatchRunner.HAS_WEBKIT_FALLBACK_BUG === null) {
+      var match = /AppleWebKit\/([0-9]+)(?:\.([0-9]+))/.exec(FontWatchRunner.getUserAgent());
+
+      FontWatchRunner.HAS_WEBKIT_FALLBACK_BUG = !!match &&
+                                          (parseInt(match[1], 10) < 536 ||
+                                           (parseInt(match[1], 10) === 536 &&
+                                            parseInt(match[2], 10) <= 11));
+    }
+    return FontWatchRunner.HAS_WEBKIT_FALLBACK_BUG;
+  };
+
   /**
    * @private
    */
@@ -152,7 +180,7 @@ goog.scope(function () {
    * @return {boolean}
    */
   FontWatchRunner.prototype.isLastResortFont_ = function (a, b) {
-    return this.browserInfo_.hasWebKitFallbackBug() && this.widthsMatchLastResortWidths_(a, b);
+    return FontWatchRunner.hasWebKitFallbackBug() && this.widthsMatchLastResortWidths_(a, b);
   };
 
   /**

data/src/core/webfont.js

@@ -4,7 +4,6 @@ goog.require('webfont.DomHelper');
 goog.require('webfont.EventDispatcher');
 goog.require('webfont.FontWatcher');
 goog.require('webfont.FontModuleLoader');
-goog.require('webfont.UserAgentParser');
 
 /**
  * @param {Window} mainWindow The main application window containing
@@ -14,10 +13,7 @@ goog.require('webfont.UserAgentParser');
 webfont.WebFont = function(mainWindow) {
   this.mainWindow_ = mainWindow;
   this.fontModuleLoader_ = new webfont.FontModuleLoader();
-  this.userAgentParser_ = new webfont.UserAgentParser(mainWindow.navigator.userAgent, mainWindow.document);
-  this.userAgent_ = this.userAgentParser_.parse();
   this.moduleLoading_ = 0;
-  this.moduleFailedLoading_ = 0;
   this.events_ = true;
   this.classes_ = true;
 };
@@ -54,35 +50,6 @@ goog.scope(function () {
     this.load_(eventDispatcher, configuration);
   };
 
-  /**
-   * @param {webfont.FontModule} module
-   * @param {webfont.EventDispatcher} eventDispatcher
-   * @param {webfont.FontWatcher} fontWatcher
-   * @param {boolean} support
-   */
-  WebFont.prototype.isModuleSupportingUserAgent_ = function(module, eventDispatcher,
-      fontWatcher, support) {
-    var that = this;
-
-    if (support) {
-      module.load(function (fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
-        that.onModuleReady_(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts);
-      });
-    } else {
-      var allModulesLoaded = --this.moduleLoading_ == 0;
-
-      this.moduleFailedLoading_--;
-
-      if (allModulesLoaded && this.moduleFailedLoading_ == 0) {
-        eventDispatcher.dispatchInactive();
-      } else {
-        if (this.classes_ || this.events_) {
-          fontWatcher.watchFonts([], {}, null, allModulesLoaded);
-        }
-      }
-    }
-  };
-
   /**
    * @param {webfont.EventDispatcher} eventDispatcher
    * @param {webfont.FontWatcher} fontWatcher
@@ -115,16 +82,16 @@ goog.scope(function () {
 
     modules = this.fontModuleLoader_.getModules(configuration, this.domHelper_);
 
-    this.moduleFailedLoading_ = this.moduleLoading_ = modules.length;
+    var fontWatcher = new webfont.FontWatcher(this.domHelper_, eventDispatcher, timeout);
 
-    var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.domHelper_, eventDispatcher, timeout);
+    this.moduleLoading_ = modules.length;
 
     for (var i = 0, len = modules.length; i < len; i++) {
       var module = modules[i];
 
-      module.supportUserAgent(this.userAgent_,
-          goog.bind(this.isModuleSupportingUserAgent_, this, module,
-          eventDispatcher, fontWatcher));
+      module.load(function (fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
+        self.onModuleReady_(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts);
+      });
     }
   };
 });

data/src/modules.yml

@@ -1,10 +1,6 @@
 core:
   - ../tools/compiler/base.js
   - core/domhelper.js
-  - core/browserinfo.js
-  - core/version.js
-  - core/useragent.js
-  - core/useragentparser.js
   - core/cssclassname.js
   - core/font.js
   - core/eventdispatcher.js

data/src/modules/custom.js

@@ -56,8 +56,4 @@ goog.scope(function () {
 
     onReady(fonts, fontTestStrings);
   };
-
-  Custom.prototype.supportUserAgent = function(userAgent, support) {
-    return support(userAgent.getBrowserInfo().hasWebFontSupport());
-  };
 });

data/src/modules/fontdeck.js

@@ -33,7 +33,7 @@ goog.scope(function () {
     return protocol + api + hostname + '/' + projectId + '.js';
   };
 
-  Fontdeck.prototype.supportUserAgent = function(userAgent, support) {
+  Fontdeck.prototype.load = function(onReady) {
     var projectId = this.configuration_['id'];
     var loadWindow = this.domHelper_.getLoadWindow();
     var self = this;
@@ -51,21 +51,17 @@ goog.scope(function () {
           var font = data['fonts'][i];
           self.fonts_.push(new Font(font['name'], Font.parseCssVariation('font-weight:' + font['weight'] + ';font-style:' + font['style'])));
         }
-        support(fontdeckSupports);
+        onReady(self.fonts_);
       };
 
       // Call the Fontdeck API.
       this.domHelper_.loadScript(this.getScriptSrc(projectId), function (err) {
         if (err) {
-          support(false);
+          onReady([]);
         }
       });
     } else {
-      support(false);
+      onReady([]);
     }
   };
-
-  Fontdeck.prototype.load = function(onReady) {
-    onReady(this.fonts_);
-  };
 });

data/src/modules/google/googlefontapi.js

@@ -9,10 +9,6 @@ goog.require('webfont.FontWatchRunner');
  * @implements {webfont.FontModule}
  */
 webfont.modules.google.GoogleFontApi = function(domHelper, configuration) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-
-  this.userAgent_ = userAgentParser.parse();
-
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
 };
@@ -35,20 +31,8 @@ goog.scope(function () {
     "Tinos": true
   };
 
-  GoogleFontApi.prototype.supportUserAgent = function(userAgent, support) {
-    support(userAgent.getBrowserInfo().hasWebFontSupport());
-  };
-
   GoogleFontApi.prototype.load = function(onReady) {
-    var domHelper = this.domHelper_;
-    var nonBlockingIe = this.userAgent_.getName() == 'MSIE' &&
-        this.configuration_['blocking'] != true;
-
-    if (nonBlockingIe) {
-      domHelper.whenBodyExists(goog.bind(this.insertLink_, this, onReady));
-    } else {
-      this.insertLink_(onReady);
-    }
+    this.insertLink_(onReady);
   };
 
   GoogleFontApi.prototype.insertLink_ = function(onReady) {