webfontloader 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31821caf4efeb4ba4f34b805d4fd76b56bb35c4b
-  data.tar.gz: 8e759e2ae26ab7a5ff848244591f574f7642a43c
+  metadata.gz: d9589210eedec7a4bae571f227f5968a0e9b05c7
+  data.tar.gz: d54107d873a216a96075796973fdf8ad091cd46c
 SHA512:
-  metadata.gz: b42346ace09821590399f9de42b038a0c852d0c264fdc20311a2ed7c41ea17af04d7407ddd553f254ebb5c672df52b3de55dd7418ec3003394d423b3f44b1931
-  data.tar.gz: cbfcd9c839eda2b1ebba42514e832bc90d654627c694a9a4bd8fb1e16b1c83471b94aa13553f6a06fa1edade50a9a1b406b724f4a8888a2a87bde021e82351b2
+  metadata.gz: 0971500a308575e9b2a8b8058c03c56089019bc800bf3efd618051c1a076e465e262de943a6b4451b1cdf02ea14f38e4a65dd398d92dcc63ad0c8d2fc949da56
+  data.tar.gz: 113d98006682af2b0792d58cf08aae4a4fecdcbc1fafcc0f5bf2b7349d87a103ff1e241e0836aedfb5bf17e0be2321875bfe1d1efc4e03174e4a58c1382c9d4d

data/README.md

@@ -9,23 +9,23 @@ Web Font Loader gives you added control when using linked fonts via `@font-face`
 * [Get started](#get-started)
 * [Configuration](#configuration)
     * [Events](#events)
-    * [Timeout](#timeout)
+    * [Timeout](#timeouts)
     * [Iframes](#iframes)
 * [Modules](#modules)
     * [Custom](#custom)
     * [Fontdeck](#fontdeck)
-    * [Fonts.com](#fonts.com)
+    * [Fonts.com](#fontscom)
     * [Google](#google)
     * [Typekit](#typekit)
 * [Browser support](#browser-support)
-* [License](#license)
+* [License](#copyright-and-license)
 
 ## Get Started
 
 To use the Web Font Loader library, just include it in your page and tell it which fonts to load. For example, you could load fonts from [Google Fonts](http://www.google.com/fonts/) using the Web Font Loader hosted on [Google Hosted Libraries](https://developers.google.com/speed/libraries/) using the following code.
 
 ```html
-<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/webfont/1.5.6/webfont.js"></script>
 <script>
   WebFont.load({
     google: {
@@ -48,7 +48,7 @@ It is also possible to use the Web Font Loader asynchronously. For example, to l
   (function() {
     var wf = document.createElement('script');
     wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
-              '://ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js';
+              '://ajax.googleapis.com/ajax/libs/webfont/1.5.6/webfont.js';
     wf.type = 'text/javascript';
     wf.async = 'true';
     var s = document.getElementsByTagName('script')[0];
@@ -131,7 +131,7 @@ WebFontConfig = {
 };
 ```
 
-The timeout value should be in milliseconds, and defaults to 5000 milliseconds (5 seconds) if not supplied.
+The timeout value should be in milliseconds, and defaults to 3000 milliseconds (3 seconds) if not supplied.
 
 ### Iframes
 
@@ -200,7 +200,7 @@ In this example, the `fonts.css` file might look something like this:
 If your fonts are already included in another stylesheet you can also leave out the `urls` array and just specify font family names to start font loading. As long as the names match those that are declared in the `families` array, the proper loading classes will be applied to the html element.
 
 ```html
-<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
+<script src="//ajax.googleapis.com/ajax/libs/webfont/1.5.6/webfont.js"></script>
 <script>
   WebFont.load({
     custom: {
@@ -271,7 +271,7 @@ WebFontConfig = {
 };
 ```
 
-You can also supply the `text` parameter to perform character subsetting:
+Sometimes the font you requested doesn't come in the default variation (e.g. `n4`) and you need to explicitly request the variation you want for font events to work (e.g. `n3`, `n7`, etc.). You can also supply the `text` parameter to perform character subsetting:
 
 ```javascript
 WebFontConfig = {

data/Rakefile

@@ -83,6 +83,10 @@ directory "tmp"
 desc "Compile the JavaScript into target/webfont.js"
 task :compile, [:modules] => "target/webfont.js"
 
+file "webfontloader.js" => "target/webfont.js" do
+  cp "target/webfont.js", "webfontloader.js"
+end
+
 file "target/webfont.js", [:modules] => SourceJs + ["target"] do |t, args|
   args.with_defaults(:modules => 'custom google typekit monotype fontdeck')
 
@@ -205,7 +209,7 @@ end
 #
 #############################################################################
 
-task :release => :build do
+task :release => [:build, "webfontloader.js"] do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!

data/lib/webfontloader.rb

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

data/spec/core/font_spec.js

@@ -39,6 +39,24 @@ describe('Font', function () {
     });
   });
 
+  describe('#toCssString', function () {
+    function toCssString(fvd) {
+      return new Font('My Family', fvd).toCssString();
+    }
+
+    it('should expand font styles correctly', function () {
+      expect(toCssString('n4')).toEqual("normal 400 300px 'My Family'");
+      expect(toCssString('i4')).toEqual("italic 400 300px 'My Family'");
+      expect(toCssString('o4')).toEqual("oblique 400 300px 'My Family'");
+    });
+
+    it('should expand weights correctly', function () {
+      for (var i = 1; i < 10; i += 1) {
+        expect(toCssString('n' + i)).toEqual("normal " + (i * 100) + " 300px 'My Family'");
+      }
+    });
+  });
+
   describe('#getCssVariation', function () {
     function toCss(fvd) {
       return new Font('My Family', fvd).getCssVariation();

data/spec/core/fontwatcher_spec.js

@@ -5,6 +5,7 @@ describe('FontWatcher', function () {
       UserAgent = webfont.UserAgent,
       BrowserInfo = webfont.BrowserInfo,
       DomHelper = webfont.DomHelper,
+      Version = webfont.Version,
       domHelper = new DomHelper(window),
       eventDispatcher = {},
       testStrings = null,
@@ -17,7 +18,19 @@ describe('FontWatcher', function () {
       activeFonts = [];
 
   beforeEach(function () {
-    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
+    userAgent = new UserAgent(
+      'Firefox',
+      new Version(3, 6),
+      '3.6',
+      'Gecko',
+      new Version(1, 9, 3),
+      '1.9.3',
+      'Macintosh',
+      new Version(10, 6),
+      '10.6',
+      undefined,
+      new BrowserInfo(true, false, false, false)
+    );
     font1 = new Font('font1');
     font2 = new Font('font2');
     font3 = new Font('font3');

data/spec/core/nativefontwatchrunner_spec.js

@@ -0,0 +1,108 @@
+describe('NativeFontWatchRunner', function () {
+  var NativeFontWatchRunner = webfont.NativeFontWatchRunner,
+      Font = webfont.Font,
+      UserAgentParser = webfont.UserAgentParser,
+      DomHelper = webfont.DomHelper,
+      FontRuler = webfont.FontRuler;
+
+  var domHelper = null,
+      activeCallback = null,
+      inactiveCallback = null,
+      userAgent = null,
+      nullFont = null,
+      sourceSansC = null,
+      elena = null;
+
+  beforeEach(function () {
+    domHelper = new DomHelper(window);
+
+    activeCallback = jasmine.createSpy('activeCallback');
+    inactiveCallback = jasmine.createSpy('inactiveCallback');
+
+    var userAgentParser = new UserAgentParser(window.navigator.userAgent, window.document);
+
+    nullFont = new Font('__webfontloader_test_3__');
+    sourceSansC = new Font('SourceSansC');
+    elena = new Font('Elena');
+
+    userAgent = userAgentParser.parse();
+  });
+
+  if (window['FontFace']) {
+    it('should fail to load a null font', function () {
+      var fontWatchRunner = new NativeFontWatchRunner(activeCallback, inactiveCallback,
+          domHelper, nullFont);
+
+      runs(function () {
+        fontWatchRunner.start();
+      });
+
+      waitsFor(function () {
+        return activeCallback.wasCalled || inactiveCallback.wasCalled;
+      });
+
+      runs(function () {
+        expect(inactiveCallback).toHaveBeenCalledWith(nullFont);
+      });
+    });
+
+    it('should load font succesfully', function () {
+      var fontWatchRunner = new NativeFontWatchRunner(activeCallback, inactiveCallback,
+          domHelper, sourceSansC),
+          ruler = new FontRuler(domHelper, 'abcdef'),
+          monospace = new Font('monospace'),
+          sourceSansCFallback = new Font('SourceSansC, monospace'),
+          activeWidth = null,
+          originalWidth = null,
+          finalCheck = false;
+
+      runs(function () {
+        ruler.insert();
+        ruler.setFont(monospace);
+        originalWidth = ruler.getWidth();
+        ruler.setFont(sourceSansCFallback);
+        fontWatchRunner.start();
+      });
+
+      waitsFor(function () {
+        return activeCallback.wasCalled || inactiveCallback.wasCalled;
+      });
+
+      runs(function () {
+        expect(activeCallback).toHaveBeenCalledWith(sourceSansC);
+        activeWidth = ruler.getWidth();
+        expect(activeWidth).not.toEqual(originalWidth);
+
+        window.setTimeout(function () {
+          finalCheck = true;
+        }, 200);
+      });
+
+      waitsFor(function () {
+        return finalCheck;
+      });
+
+      runs(function () {
+        expect(ruler.getWidth()).not.toEqual(originalWidth);
+        expect(ruler.getWidth()).toEqual(activeWidth);
+      });
+    });
+
+    it('should attempt to load a non-existing font', function () {
+      var fontWatchRunner = new NativeFontWatchRunner(activeCallback, inactiveCallback,
+          domHelper, elena);
+
+      runs(function () {
+        fontWatchRunner.start();
+      });
+
+      waitsFor(function () {
+        return activeCallback.wasCalled || inactiveCallback.wasCalled;
+      });
+
+      runs(function () {
+        expect(inactiveCallback).toHaveBeenCalledWith(elena);
+      });
+    });
+  }
+});

data/spec/core/webfont_spec.js

@@ -3,6 +3,7 @@ describe('WebFont', function () {
       Font = webfont.Font;
       UserAgent = webfont.UserAgent,
       FontWatchRunner = webfont.FontWatchRunner,
+      NativeFontWatchRunner = webfont.NativeFontWatchRunner,
       BrowserInfo = webfont.BrowserInfo,
       Version = webfont.Version,
       Font = webfont.Font,
@@ -22,7 +23,7 @@ describe('WebFont', function () {
       new Version(10, 6),
       '10.6',
       undefined,
-      new BrowserInfo(true, false, false)
+      new BrowserInfo(true, false, false, false)
     );
     fontModuleLoader = new FontModuleLoader();
   });
@@ -156,6 +157,14 @@ describe('WebFont', function () {
           }
         });
 
+        spyOn(NativeFontWatchRunner.prototype, 'start').andCallFake(function () {
+          if (conf.id) {
+            active(font);
+          } else {
+            inactive(font);
+          }
+        });
+
         testModule.supportUserAgent = function (userAgent, support) {
           if (conf.id) {
             // The monotype module only initializes font

data/spec/deps.js

@@ -8,9 +8,10 @@ goog.addDependency("../../src/core/font.js", ["webfont.Font"], []);
 goog.addDependency("../../src/core/fontmodule.js", ["webfont.FontModule"], []);
 goog.addDependency("../../src/core/fontmoduleloader.js", ["webfont.FontModuleLoader","webfont.FontModuleFactory"], []);
 goog.addDependency("../../src/core/fontruler.js", ["webfont.FontRuler"], []);
-goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["webfont.FontWatchRunner"]);
+goog.addDependency("../../src/core/fontwatcher.js", ["webfont.FontWatcher"], ["webfont.FontWatchRunner","webfont.NativeFontWatchRunner"]);
 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"], []);

data/spec/fixtures/fonts/sourcesansc.css

@@ -0,0 +1 @@
+@font-face{font-family:SourceSansC;src:url(sourcesans.eot?#iefix) format('embedded-opentype'),url(sourcesans.woff) format('woff'),url(sourcesans.otf) format('opentype'),url(sourcesans.ttf) format('truetype'),url(sourcesans.svg#source_sans_proregular) format('svg');}

data/spec/fixtures/fonts/sourcesansd.css

@@ -0,0 +1 @@
+@font-face{font-family:SourceSansD;src:url(sourcesans.eot?#iefix) format('embedded-opentype'),url(sourcesans.woff) format('woff'),url(sourcesans.otf) format('opentype'),url(sourcesans.ttf) format('truetype'),url(sourcesans.svg#source_sans_proregular) format('svg');}

data/spec/index.html

@@ -10,6 +10,7 @@
     <link rel="stylesheet" href="fixtures/fonts/nullfont2.css">
     <link rel="stylesheet" href="fixtures/fonts/nullfont3.css">
     <link rel="stylesheet" href="fixtures/fonts/sourcesansa.css">
+    <link rel="stylesheet" href="fixtures/fonts/sourcesansc.css">
  </head>
  <body>
     <script>
@@ -34,6 +35,7 @@
     <script src="../spec/core/font_spec.js"></script>
     <script src="../spec/core/fontruler_spec.js"></script>
     <script src="../spec/core/fontwatchrunner_spec.js"></script>
+    <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>

data/spec/modules/monotype_spec.js

@@ -42,7 +42,7 @@ describe('modules.Monotype', function () {
       new Version(10, 6),
       '10.6',
       undefined,
-      new BrowserInfo(true, false, false)
+      new BrowserInfo(true, false, false, false)
     );
 
     monotype = new Monotype(fakeDomHelper, configuration);

data/src/core/browserinfo.js

@@ -7,10 +7,11 @@ goog.provide('webfont.BrowserInfo');
  * @param {boolean} webKitFallbackBug
  * @param {boolean} webKitMetricsBug
  */
-webfont.BrowserInfo = function (webfontSupport, webKitFallbackBug, webKitMetricsBug) {
+webfont.BrowserInfo = function (webfontSupport, webKitFallbackBug, webKitMetricsBug, hasNativeFontLoading) {
   this.webfontSupport_ = webfontSupport;
   this.webKitFallbackBug_ = webKitFallbackBug;
   this.webKitMetricsBug_ = webKitMetricsBug;
+  this.hasNativeFontLoading_ = hasNativeFontLoading;
 };
 
 goog.scope(function () {
@@ -70,4 +71,14 @@ goog.scope(function () {
   BrowserInfo.prototype.hasWebKitMetricsBug = function () {
     return this.webKitMetricsBug_;
   };
+
+  /**
+   * @export
+   *
+   * Returns true if this browser has native font loading as
+   * specified in: http://dev.w3.org/csswg/css-font-loading/
+   */
+  BrowserInfo.prototype.hasNativeFontLoading = function () {
+    return this.hasNativeFontLoading_;
+  };
 });

data/src/core/font.js

@@ -41,6 +41,16 @@ goog.scope(function () {
     return this.quote_(this.name_);
   };
 
+  /**
+   * Returns a CSS string representation of the font that
+   * can be used as the CSS font property shorthand.
+   *
+   * @return {string}
+   */
+  Font.prototype.toCssString = function () {
+    return this.getCssStyle() + ' ' + this.getCssWeight() + ' 300px ' + this.getCssName();
+  };
+
   /**
    * @private
    * @param {string} name
@@ -71,8 +81,21 @@ goog.scope(function () {
    * @return {string}
    */
   Font.prototype.getCssVariation = function () {
-    var style = 'normal',
-        weight = this.weight_ + '00';
+    return 'font-style:' + this.getCssStyle() + ';font-weight:' + this.getCssWeight() + ';';
+  };
+
+  /**
+   * @return {string}
+   */
+  Font.prototype.getCssWeight = function () {
+    return this.weight_ + '00';
+  };
+
+  /**
+   * @return {string}
+   */
+  Font.prototype.getCssStyle = function () {
+    var style = 'normal';
 
     if (this.style_ === 'o') {
       style = 'oblique';
@@ -80,7 +103,7 @@ goog.scope(function () {
       style = 'italic';
     }
 
-    return 'font-style:' + style + ';font-weight:' + weight + ';';
+    return style;
   };
 
   /**

data/src/core/fontwatcher.js

@@ -1,7 +1,7 @@
 goog.provide('webfont.FontWatcher');
 
 goog.require('webfont.FontWatchRunner');
-
+goog.require('webfont.NativeFontWatchRunner');
 /**
  * @constructor
  * @param {webfont.UserAgent} userAgent
@@ -22,7 +22,8 @@ webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, opt_timeou
 
 goog.scope(function () {
   var FontWatcher = webfont.FontWatcher,
-      FontWatchRunner = webfont.FontWatchRunner;
+      FontWatchRunner = webfont.FontWatchRunner,
+      NativeFontWatchRunner = webfont.NativeFontWatchRunner;
 
   /**
    * Watches a set of font families.
@@ -53,7 +54,19 @@ goog.scope(function () {
 
       this.eventDispatcher_.dispatchFontLoading(font);
 
-      var fontWatchRunner = new FontWatchRunner(
+      var fontWatchRunner = null;
+
+      if (this.browserInfo_.hasNativeFontLoading()) {
+        fontWatchRunner = new NativeFontWatchRunner(
+            goog.bind(this.fontActive_, this),
+            goog.bind(this.fontInactive_, this),
+            this.domHelper_,
+            font,
+            this.timeout_,
+            fontTestString
+          );
+      } else {
+        fontWatchRunner = new FontWatchRunner(
             goog.bind(this.fontActive_, this),
             goog.bind(this.fontInactive_, this),
             this.domHelper_,
@@ -63,6 +76,7 @@ goog.scope(function () {
             metricCompatibleFonts,
             fontTestString
           );
+      }
 
       fontWatchRunner.start();
     }

data/src/core/fontwatchrunner.js

@@ -23,7 +23,7 @@ webfont.FontWatchRunner = function(activeCallback, inactiveCallback, domHelper,
   this.fontTestString_ = opt_fontTestString || webfont.FontWatchRunner.DEFAULT_TEST_STRING;
   this.browserInfo_ = browserInfo;
   this.lastResortWidths_ = {};
-  this.timeout_ = opt_timeout || 5000;
+  this.timeout_ = opt_timeout || 3000;
 
   this.metricCompatibleFonts_ = opt_metricCompatibleFonts || null;
 

data/src/core/nativefontwatchrunner.js

@@ -0,0 +1,46 @@
+goog.provide('webfont.NativeFontWatchRunner');
+
+goog.require('webfont.Font');
+
+goog.scope(function () {
+  /**
+  * @constructor
+  * @param {function(webfont.Font)} activeCallback
+  * @param {function(webfont.Font)} inactiveCallback
+  * @param {webfont.DomHelper} domHelper
+  * @param {webfont.Font} font
+  * @param {number=} opt_timeout
+  * @param {string=} opt_fontTestString
+  */
+  webfont.NativeFontWatchRunner = function(activeCallback, inactiveCallback, domHelper, font, opt_timeout, opt_fontTestString) {
+    this.activeCallback_ = activeCallback;
+    this.inactiveCallback_ = inactiveCallback;
+    this.font_ = font;
+    this.domHelper_ = domHelper;
+    this.timeout_ = opt_timeout || 3000;
+    this.fontTestString_ = opt_fontTestString || undefined;
+  };
+
+  var NativeFontWatchRunner = webfont.NativeFontWatchRunner;
+
+  NativeFontWatchRunner.prototype.start = function () {
+    var doc = this.domHelper_.getLoadWindow().document,
+        that = this;
+
+    // We're using Promises here because the font load API
+    // uses them, so we can be sure they're available.
+    Promise.race([new Promise(function (resolve, reject) {
+      goog.global.setTimeout(function () {
+        reject(that.font_);
+      }, that.timeout_);
+    }), doc.fonts.load(this.font_.toCssString(), this.fontTestString_)]).then(function (fonts) {
+      if (fonts.length === 1) {
+        that.activeCallback_(that.font_);
+      } else {
+        that.inactiveCallback_(that.font_);
+      }
+    }, function () {
+      that.inactiveCallback_(that.font_);
+    });
+  };
+});

data/src/core/useragentparser.js

@@ -44,7 +44,7 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     new webfont.Version(),
     webfont.UserAgentParser.UNKNOWN,
     undefined,
-    new webfont.BrowserInfo(false, false, false));
+    new webfont.BrowserInfo(false, false, false, false));
 
 
 goog.scope(function () {
@@ -191,7 +191,7 @@ goog.scope(function () {
       platformVersion,
       platformVersionString,
       documentMode,
-      new BrowserInfo(supportWebFont, false, false)
+      new BrowserInfo(supportWebFont, false, false, !!this.doc_['fonts'])
     );
   };
 
@@ -246,7 +246,7 @@ goog.scope(function () {
         platformVersion,
         platformVersionString,
         documentMode,
-        new BrowserInfo(false, false, false)
+        new BrowserInfo(false, false, false, !!this.doc_['fonts'])
       );
     }
 
@@ -267,7 +267,7 @@ goog.scope(function () {
           platformVersion,
           platformVersionString,
           documentMode,
-          new BrowserInfo(browserVersion.major >= 10, false, false)
+          new BrowserInfo(browserVersion.major >= 10, false, false, !!this.doc_['fonts'])
         );
       }
     }
@@ -286,7 +286,7 @@ goog.scope(function () {
         platformVersion,
         platformVersionString,
         documentMode,
-        new BrowserInfo(browserVersion.major >= 10, false, false)
+        new BrowserInfo(browserVersion.major >= 10, false, false, !!this.doc_['fonts'])
       );
     }
     return new UserAgent(
@@ -300,7 +300,7 @@ goog.scope(function () {
       platformVersion,
       platformVersionString,
       documentMode,
-      new BrowserInfo(false, false, false)
+      new BrowserInfo(false, false, false, !!this.doc_['fonts'])
     );
   };
 
@@ -386,7 +386,7 @@ goog.scope(function () {
       platformVersion,
       platformVersionString,
       this.getDocumentMode_(this.doc_),
-      new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug)
+      new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug, !!this.doc_['fonts'])
     );
   };
 
@@ -438,7 +438,7 @@ goog.scope(function () {
       platformVersion,
       platformVersionString,
       this.getDocumentMode_(this.doc_),
-      new BrowserInfo(supportWebFont, false, false)
+      new BrowserInfo(supportWebFont, false, false, !!this.doc_['fonts'])
     );
   };
 

data/src/modules.yml

@@ -11,6 +11,7 @@ core:
   - core/fontmodule.js
   - core/fontmoduleloader.js
   - core/fontruler.js
+  - core/nativefontwatchrunner.js
   - core/fontwatchrunner.js
   - core/fontwatcher.js
   - core/webfont.js

data/tools/compiler/base.js

@@ -1473,65 +1473,6 @@ goog.inherits = function(childCtor, parentCtor) {
   childCtor.prototype.constructor = childCtor;
 };
 
-
-/**
- * Call up to the superclass.
- *
- * If this is called from a constructor, then this calls the superclass
- * contructor with arguments 1-N.
- *
- * If this is called from a prototype method, then you must pass
- * the name of the method as the second argument to this function. If
- * you do not, you will get a runtime error. This calls the superclass'
- * method with arguments 2-N.
- *
- * This function only works if you use goog.inherits to express
- * inheritance relationships between your classes.
- *
- * This function is a compiler primitive. At compile-time, the
- * compiler will do macro expansion to remove a lot of
- * the extra overhead that this function introduces. The compiler
- * will also enforce a lot of the assumptions that this function
- * makes, and treat it as a compiler error if you break them.
- *
- * @param {!Object} me Should always be "this".
- * @param {*=} opt_methodName The method name if calling a super method.
- * @param {...*} var_args The rest of the arguments.
- * @return {*} The return value of the superclass method.
- */
-goog.base = function(me, opt_methodName, var_args) {
-  var caller = arguments.callee.caller;
-  if (caller.superClass_) {
-    // This is a constructor. Call the superclass constructor.
-    return caller.superClass_.constructor.apply(
-        me, Array.prototype.slice.call(arguments, 1));
-  }
-
-  var args = Array.prototype.slice.call(arguments, 2);
-  var foundCaller = false;
-  for (var ctor = me.constructor;
-       ctor; ctor = ctor.superClass_ && ctor.superClass_.constructor) {
-    if (ctor.prototype[opt_methodName] === caller) {
-      foundCaller = true;
-    } else if (foundCaller) {
-      return ctor.prototype[opt_methodName].apply(me, args);
-    }
-  }
-
-  // If we did not find the caller in the prototype chain,
-  // then one of two things happened:
-  // 1) The caller is an instance method.
-  // 2) This method was not called by the right caller.
-  if (me[opt_methodName] === caller) {
-    return me.constructor.prototype[opt_methodName].apply(me, args);
-  } else {
-    throw Error(
-        'goog.base called from a method of one name ' +
-        'to a method of a different name');
-  }
-};
-
-
 /**
  * Allow for aliasing within scope functions.  This function exists for
  * uncompiled code - in compiled code the calls will be inlined and the

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.5.6'
-  s.date              = '2014-09-03'
+  s.version           = '1.5.7'
+  s.date              = '2014-11-17'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -117,6 +117,7 @@ DESC
     spec/core/fontruler_spec.js
     spec/core/fontwatcher_spec.js
     spec/core/fontwatchrunner_spec.js
+    spec/core/nativefontwatchrunner_spec.js
     spec/core/size_spec.js
     spec/core/useragentparser_spec.js
     spec/core/version_spec.js
@@ -136,6 +137,8 @@ DESC
     spec/fixtures/fonts/sourcesans.woff
     spec/fixtures/fonts/sourcesansa.css
     spec/fixtures/fonts/sourcesansb.css
+    spec/fixtures/fonts/sourcesansc.css
+    spec/fixtures/fonts/sourcesansd.css
     spec/index.html
     spec/modules/custom_spec.js
     spec/modules/fontdeck_spec.js
@@ -156,6 +159,7 @@ DESC
     src/core/fontwatcher.js
     src/core/fontwatchrunner.js
     src/core/initialize.js
+    src/core/nativefontwatchrunner.js
     src/core/useragent.js
     src/core/useragentparser.js
     src/core/version.js

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webfontloader
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Ryan Carver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -126,6 +126,7 @@ files:
 - spec/core/fontruler_spec.js
 - spec/core/fontwatcher_spec.js
 - spec/core/fontwatchrunner_spec.js
+- spec/core/nativefontwatchrunner_spec.js
 - spec/core/size_spec.js
 - spec/core/useragentparser_spec.js
 - spec/core/version_spec.js
@@ -145,6 +146,8 @@ files:
 - spec/fixtures/fonts/sourcesans.woff
 - spec/fixtures/fonts/sourcesansa.css
 - spec/fixtures/fonts/sourcesansb.css
+- spec/fixtures/fonts/sourcesansc.css
+- spec/fixtures/fonts/sourcesansd.css
 - spec/index.html
 - spec/modules/custom_spec.js
 - spec/modules/fontdeck_spec.js
@@ -165,6 +168,7 @@ files:
 - src/core/fontwatcher.js
 - src/core/fontwatchrunner.js
 - src/core/initialize.js
+- src/core/nativefontwatchrunner.js
 - src/core/useragent.js
 - src/core/useragentparser.js
 - src/core/version.js