webfontloader 1.4.9 → 1.4.10

data/CHANGELOG

@@ -1,3 +1,9 @@
+v1.4.10 (July 31, 2013)
+* Add loadStylesheet method with optional callback that replaces createCssLink
+* Remove supportForStyle check because it breaks XHTML/SVG and is no longer necessary
+* Fix inactive never called when script loading times out
+* Move test assets into fixtures directory
+
 v1.4.9 (July 24, 2013)
 * Disable terminal spec report when not using PhantomJS
 * Remove obsolete namespace declaration

data/CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing
+
+Please open [an issue](https://github.com/typekit/webfontloader/issues) if you find or suspect any problems. Sample pages and test cases are greatly appreciated.
+
+## Development requirements
+
+You'll need a few rubygems to run the tests, demo server, and other rake tasks, which should be installed with [Bundler](http://gembundler.com/).
+
+    $ gem install bundler
+    $ bundle install
+
+To run the tests in a headless WebKit you will also need to have [PhantomJS](http://www.phantomjs.org) installed. You can install PhantomJS by downloading a binary of using HomeBrew.
+
+    $ brew install phantomjs
+
+## Building
+
+To build a JS file from source, just run rake:
+
+    $ rake
+
+## Demos
+
+A full suite of demo pages is included in this source. Here you can find some
+live examples using the JS and CSS events. Run the demo server with:
+
+    $ rake demo
+
+You can also run the demos with uncompressed, debuggable code to aid in
+development. Just start the server in dev mode:
+
+    $ rake demodev
+
+Browse the demos [source code](http://github.com/typekit/webfontloader/blob/master/lib/webfontloader/demo/public).
+
+## Testing
+
+Web Font Loader has an extensive test suite that runs via Jasmine. The test suite
+should be passing before submitting a pull request, and new tests should be added for any new functionality.
+
+To run tests, open up `spec/index.html` in a browser and check the results. The
+test suite will run automatically. Again, before submitting a pull request
+please run the test suite in multiple browsers and list them in the pull request.
+
+To run tests in a headless WebKit using [PhantomJS](http://www.phantomjs.org) run:
+
+    $ rake test

data/README.md

@@ -19,7 +19,6 @@ Web Font Loader gives you added control when using linked fonts via `@font-face`
     * [Google](#google)
     * [Typekit](#typekit)
 * [Browser support](#browser-support)
-* [Contributing](#contributing)
 * [License](#license)
 
 ## Get Started
@@ -270,54 +269,6 @@ For example:
 
 If `providerA` can serve fonts to a browser, but `providerB` cannot, The `fontinactive` event will be triggered for `Family2`. The `fontactive` event will be triggered for `Family1` once it loads, as will the `active` event.
 
-## Contributing
-
-Please open [an issue](https://github.com/typekit/webfontloader/issues) if you find or suspect any problems. Sample pages and test cases are greatly appreciated.
-
-### Development requirements
-
-You'll need a few rubygems to run the tests, demo server, and other rake tasks, which should be installed with [Bundler](http://gembundler.com/).
-
-    $ gem install bundler
-    $ bundle install
-
-To run the tests in a headless WebKit you will also need to have [PhantomJS](http://www.phantomjs.org) installed. You can install PhantomJS by downloading a binary of using HomeBrew.
-
-    $ brew install phantomjs
-
-### Building
-
-To build a JS file from source, just run rake:
-
-    $ rake
-
-### Demos
-
-A full suite of demo pages is included in this source. Here you can find some
-live examples using the JS and CSS events. Run the demo server with:
-
-    $ rake demo
-
-You can also run the demos with uncompressed, debuggable code to aid in
-development. Just start the server in dev mode:
-
-    $ rake demodev
-
-Browse the demos [source code](http://github.com/typekit/webfontloader/blob/master/lib/webfontloader/demo/public).
-
-### Testing
-
-Web Font Loader has an extensive test suite that runs via Jasmine. The test suite
-should be passing before submitting a pull request, and new tests should be added for any new functionality.
-
-To run tests, open up `spec/index.html` in a browser and check the results. The
-test suite will run automatically. Again, before submitting a pull request
-please run the test suite in multiple browsers and list them in the pull request.
-
-To run tests in a headless WebKit using [PhantomJS](http://www.phantomjs.org) run:
-
-    $ rake test
-
 ## License
 
 Web Font Loader is released under the [Apache 2.0](http://github.com/typekit/webfontloader/blob/master/LICENSE) license.

data/lib/webfontloader.rb

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

data/spec/core/domhelper_spec.js

@@ -44,31 +44,6 @@ describe('DomHelper', function () {
     });
   });
 
-  describe('#createCssLink', function () {
-    var link = domHelper.createCssLink('http://moo/somecss.css');
-
-    it('should create a link', function () {
-      expect(link).not.toBeNull();
-    });
-
-    it('should create a link with correct rel and href properties', function () {
-      expect(link.rel).toEqual('stylesheet');
-      expect(link.href).toEqual('http://moo/somecss.css');
-    });
-  });
-
-  describe('#createScriptSrc', function () {
-    var script = domHelper.createScriptSrc('http://moo/somescript.js');
-
-    it('should create a script element', function () {
-      expect(script).not.toBeNull();
-    });
-
-    it('should have a src property', function () {
-      expect(script.src).toEqual('http://moo/somescript.js');
-    });
-  });
-
   describe('#appendClassName', function () {
     it('should have added a class name', function () {
       var div = domHelper.createElement('div');
@@ -178,10 +153,35 @@ describe('DomHelper', function () {
     });
   });
 
+  describe('#loadStylesheet', function () {
+    it('should load the stylesheet', function () {
+      var el = null,
+          width = null,
+          link = null;
+
+      runs(function () {
+        el = domHelper.createElement('div', { id: 'TEST_ELEMENT' });
+        domHelper.insertInto('body', el);
+        width = el.offsetWidth;
+        link = domHelper.loadStylesheet('fixtures/external_stylesheet.css');
+      });
+
+      waitsFor(function () {
+        return width !== el.offsetWidth;
+      });
+
+      runs(function () {
+        expect(link).not.toBeNull();
+        expect(link.rel).toEqual('stylesheet');
+        expect(el.offsetWidth).toEqual(300);
+      });
+    });
+  });
+
   describe('#loadScript', function () {
     it('should load the script', function () {
       runs(function () {
-        domHelper.loadScript('core/external_script.js');
+        domHelper.loadScript('fixtures/external_script.js');
       });
 
       waitsFor(function () {
@@ -194,11 +194,13 @@ describe('DomHelper', function () {
     });
 
     it('should call the callback', function () {
-      var called = false;
+      var called = false,
+          error = null;
 
       runs(function () {
-        domHelper.loadScript('core/external_script.js', function () {
+        domHelper.loadScript('fixtures/external_script.js', function (err) {
           called = true;
+          error = err;
         });
       });
 
@@ -208,6 +210,41 @@ describe('DomHelper', function () {
 
       runs(function () {
         expect(called).toBe(true);
+        expect(error).toBeFalsy();
+      });
+    });
+
+    it('should return a script element', function () {
+      var script = domHelper.loadScript('fixtures/external_script.js');
+
+      expect(script).not.toBeNull();
+      expect(script.nodeName).toEqual('SCRIPT');
+    });
+
+    it('should timeout if the script does not load or is very slow', function () {
+      var called = false,
+          error = false;
+
+      // Spy on createElement so the all loadScript code is executed but
+      // the "script" won't actually load.
+      spyOn(domHelper, 'createElement').andCallFake(function (name) {
+        return document.createElement('div');
+      });
+
+      runs(function () {
+        domHelper.loadScript('fixtures/external_script.js', function (err) {
+          called = true;
+          error = err;
+        }, 100);
+      });
+
+      waitsFor(function () {
+        return called;
+      });
+
+      runs(function () {
+        expect(called).toBe(true);
+        expect(error).toBeTruthy();
       });
     });
   });

data/spec/core/fontwatchrunner_spec.js

@@ -372,7 +372,7 @@ describe('FontWatchRunner', function () {
         var link = document.createElement('link');
 
         link.rel = "stylesheet";
-        link.href= "fonts/sourcesansb.css";
+        link.href= "fixtures/fonts/sourcesansb.css";
 
         domHelper.insertInto('head', link);
       });

data/spec/core/webfont_spec.js

@@ -270,4 +270,51 @@ describe('WebFont', function () {
       expect(inactive).toHaveBeenCalled();
     });
   });
+
+  describe('module fails to load', function () {
+    var font = null,
+        testModule = null,
+        inactive = null,
+        active = null;
+
+    beforeEach(function () {
+      inactive = jasmine.createSpy('inactive'),
+      active = jasmine.createSpy('active');
+
+      font = new WebFont(window, fontModuleLoader, userAgent);
+
+      font.addModule('test', function (conf, domHelper) {
+        testModule = new function () {};
+        testModule.supportUserAgent = function (ua, support) {
+          window.setTimeout(function () {
+            support(false);
+          }, 100);
+        };
+        testModule.load = function (onReady) {
+          onReady();
+        };
+
+        return testModule;
+      });
+    });
+
+    it('times out and calls inactive', function () {
+      runs(function () {
+        font.load({
+          'test': {},
+          inactive: inactive,
+          active: active
+        });
+      });
+
+      waitsFor(function () {
+        return active.wasCalled || inactive.wasCalled;
+      });
+
+      runs(function () {
+        expect(inactive).toHaveBeenCalled();
+        expect(active).not.toHaveBeenCalled();
+      });
+    });
+  });
 });

data/spec/fixtures/external_stylesheet.css

@@ -0,0 +1,7 @@
+#TEST_ELEMENT {
+  display: block;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 300px;
+}

data/spec/index.html

@@ -4,14 +4,14 @@
     <title>Webfontloader tests</title>
     <link rel="stylesheet" href="../tools/jasmine/jasmine.css">
 
-    <link rel="stylesheet" href="fonts/nullfont.css">
-    <link rel="stylesheet" href="fonts/nullfont1.css">
-    <link rel="stylesheet" href="fonts/nullfont2.css">
-    <link rel="stylesheet" href="fonts/nullfont3.css">
-    <link rel="stylesheet" href="fonts/sourcesansa.css">
-    <link rel="stylesheet" href="fonts/sourcesansb.css">
-    <link rel="stylesheet" href="fonts/sourcesansc.css">
-    <link rel="stylesheet" href="fonts/sourcesanscbold.css">
+    <link rel="stylesheet" href="fixtures/fonts/nullfont.css">
+    <link rel="stylesheet" href="fixtures/fonts/nullfont1.css">
+    <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/sourcesansb.css">
+    <link rel="stylesheet" href="fixtures/fonts/sourcesansc.css">
+    <link rel="stylesheet" href="fixtures/fonts/sourcesanscbold.css">
  </head>
  <body>
     <script>

data/spec/modules/ascender_spec.js

@@ -14,8 +14,7 @@ describe('modules.Ascender', function () {
 
     beforeEach(function () {
       fakeDomHelper = {
-        insertInto: jasmine.createSpy('insertInto'),
-        createCssLink: jasmine.createSpy('createCssLink'),
+        loadStylesheet: jasmine.createSpy('createCssLink'),
         getProtocol: jasmine.createSpy('getProtocol').andReturn('http:')
       };
 
@@ -26,8 +25,7 @@ describe('modules.Ascender', function () {
     });
 
     it('should create the link correctly', function () {
-      expect(fakeDomHelper.createCssLink).toHaveBeenCalledWith('http://webfonts.fontslive.com/css/ec2de397-11ae-4c10-937f-bf94283a70c1.css');
-      expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
+      expect(fakeDomHelper.loadStylesheet).toHaveBeenCalledWith('http://webfonts.fontslive.com/css/ec2de397-11ae-4c10-937f-bf94283a70c1.css');
     });
 
     it('should pass the fonts correctly', function () {

data/spec/modules/custom_spec.js

@@ -8,8 +8,7 @@ describe('modules.Custom', function () {
 
     beforeEach(function () {
       fakeDomHelper = {
-        createCssLink: jasmine.createSpy('createCssLink'),
-        insertInto: jasmine.createSpy('insertInto')
+        loadStylesheet: jasmine.createSpy('createCssLink')
       };
 
       load = jasmine.createSpy('load');
@@ -23,9 +22,9 @@ describe('modules.Custom', function () {
     });
 
     it('should have inserted the links correctly', function () {
-      expect(fakeDomHelper.createCssLink.callCount).toEqual(2);
-      expect(fakeDomHelper.createCssLink).toHaveBeenCalledWith('http://moo');
-      expect(fakeDomHelper.createCssLink).toHaveBeenCalledWith('http://meuh');
+      expect(fakeDomHelper.loadStylesheet.callCount).toEqual(2);
+      expect(fakeDomHelper.loadStylesheet).toHaveBeenCalledWith('http://moo');
+      expect(fakeDomHelper.loadStylesheet).toHaveBeenCalledWith('http://meuh');
     });
 
     it('should have loaded the families correctly', function () {

data/spec/modules/fontdeck_spec.js

@@ -52,8 +52,7 @@ describe('modules.Fontdeck', function () {
     };
 
     fakeDomHelper = {
-      insertInto: jasmine.createSpy('insertInto'),
-      createScriptSrc: jasmine.createSpy('createScriptSrc'),
+      loadScript: jasmine.createSpy('loadScript'),
       getLoadWindow: jasmine.createSpy('getLoadWindow').andReturn(global),
       getProtocol: jasmine.createSpy('getProtocol').andReturn('https:'),
       getHostName: function () { return 'test-host-name';  }
@@ -72,8 +71,8 @@ describe('modules.Fontdeck', function () {
     });
 
     it('should create the script correctly', function () {
-      expect(fakeDomHelper.createScriptSrc).toHaveBeenCalledWith('https://f.fontdeck.com/s/css/js/test-host-name/2282.js');
-      expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
+      expect(fakeDomHelper.loadScript).toHaveBeenCalled();
+      expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('https://f.fontdeck.com/s/css/js/test-host-name/2282.js');
     });
 
     it('should have created a global', function () {

data/spec/modules/google/googlefontapi_spec.js

@@ -6,10 +6,7 @@ describe('modules.google.GoogleFontApi', function () {
       link = '',
       insert = '',
       fakeDomHelper =  {
-        insertInto: function (tag, e) {
-          insert = tag;
-        },
-        createCssLink: function (cssLink) {
+        loadStylesheet: function (cssLink) {
           link = cssLink;
         },
         getProtocol: function () {
@@ -36,7 +33,6 @@ describe('modules.google.GoogleFontApi', function () {
     });
 
     it('has inserted the link element correctly', function () {
-      expect(insert).toEqual('head');
       expect(link).toEqual('http://fonts.googleapis.com/css?family=Font1%7CFont2');
     });
 
@@ -60,7 +56,6 @@ describe('modules.google.GoogleFontApi', function () {
     });
 
     it('has inserted the link element correctly', function () {
-      expect(insert).toEqual('head');
       expect(link).toEqual('http://moo?family=Font1%7CFont2');
     });
   });
@@ -74,7 +69,6 @@ describe('modules.google.GoogleFontApi', function () {
     });
 
     it('has inserted the link element correctly', function () {
-      expect(insert).toEqual('head');
       expect(link).toEqual('http://fonts.googleapis.com/css?family=Font1+WithSpace%7CFont2+WithSpaceToo');
     });
  });
@@ -88,7 +82,6 @@ describe('modules.google.GoogleFontApi', function () {
     });
 
     it('has inserted the link element correctly', function () {
-      expect(insert).toEqual('head');
       expect(link).toEqual('http://fonts.googleapis.com/css?family=Font1+WithSpace:bi%7CFont2+WithSpaceToo:b,r');
     });
  });

data/spec/modules/monotype_spec.js

@@ -22,8 +22,10 @@ describe('modules.Monotype', function () {
     global = {};
 
     fakeDomHelper = {
-      createElement: jasmine.createSpy('createElement').andReturn(script),
-      insertInto: jasmine.createSpy('insertInto'),
+      loadScript: jasmine.createSpy('loadScript').andCallFake(function (src, callback) {
+        script.onload = callback;
+        return script;
+      }),
       getLoadWindow: jasmine.createSpy('getLoadWindow').andReturn(global),
       getProtocol: jasmine.createSpy('getProtocol').andReturn('http:')
     };
@@ -57,8 +59,8 @@ describe('modules.Monotype', function () {
 
   it('should create a script element', function () {
     expect(support).toHaveBeenCalled();
-    expect(fakeDomHelper.createElement).toHaveBeenCalledWith('script');
-    expect(script.src).toEqual('http://fast.fonts.com/jsapidev/01e2ff27-25bf-4801-a23e-73d328e6c7cc.js');
+    expect(fakeDomHelper.loadScript).toHaveBeenCalled();
+    expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('http://fast.fonts.com/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

@@ -19,8 +19,7 @@ describe('modules.Typekit', function () {
     load = jasmine.createSpy('load');
 
     fakeDomHelper = {
-      insertInto: jasmine.createSpy('insertInto'),
-      createScriptSrc: jasmine.createSpy('createScriptSrc'),
+      loadScript: jasmine.createSpy('loadScript'),
       getLoadWindow: jasmine.createSpy('getLoadWindow').andReturn(global),
       getProtocol: jasmine.createSpy('getProtocol').andReturn('http:')
     };
@@ -31,8 +30,8 @@ describe('modules.Typekit', function () {
 
     typekit.supportUserAgent('useragent', support);
 
-    expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
-    expect(fakeDomHelper.createScriptSrc).toHaveBeenCalledWith('http://use.typekit.net/abc.js');
+    expect(fakeDomHelper.loadScript).toHaveBeenCalled();
+    expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('http://use.typekit.net/abc.js');
     expect(support).not.toHaveBeenCalled();
 
     expect(global.__webfonttypekitmodule__).not.toBeNull();
@@ -78,8 +77,8 @@ describe('modules.Typekit', function () {
     var typekit = new Typekit(fakeDomHelper, { id: 'abc', api: '/test' });
 
     typekit.supportUserAgent('useragent', support);
-    expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
-    expect(fakeDomHelper.createScriptSrc).toHaveBeenCalledWith('/test/abc.js');
+    expect(fakeDomHelper.loadScript).toHaveBeenCalled();
+    expect(fakeDomHelper.loadScript.calls[0].args[0]).toEqual('/test/abc.js');
   });
 
   it('should not load without a kit id', function () {
@@ -87,8 +86,7 @@ describe('modules.Typekit', function () {
 
     typekit.supportUserAgent('useragent', support);
 
-    expect(fakeDomHelper.insertInto).not.toHaveBeenCalled();
-    expect(fakeDomHelper.createScriptSrc).not.toHaveBeenCalled();
+    expect(fakeDomHelper.loadScript).not.toHaveBeenCalled();
     expect(support).toHaveBeenCalled();
 
     typekit.load(load);

data/src/core/domhelper.js

@@ -14,9 +14,6 @@ webfont.DomHelper = function(mainWindow, opt_loadWindow) {
 
   /** @type {Document} */
   this.document_ = this.loadWindow_.document;
-
-  /** @type {boolean|undefined} */
-  this.supportForStyle_ = undefined;
 };
 
 goog.scope(function () {
@@ -106,29 +103,6 @@ goog.scope(function () {
     return false;
   };
 
-  /**
-   * Creates a link to a CSS document.
-   * @param {string} src The URL of the stylesheet.
-   * @return {Element} a link element.
-   */
-  DomHelper.prototype.createCssLink = function(src) {
-    return this.createElement('link', {
-      'rel': 'stylesheet',
-      'href': src
-    });
-  };
-
-  /**
-   * Creates a link to a javascript document.
-   * @param {string} src The URL of the script.
-   * @return {Element} a script element.
-   */
-  DomHelper.prototype.createScriptSrc = function(src) {
-    return this.createElement('script', {
-      'src': src
-    });
-  };
-
   /**
    * Appends a name to an element's class attribute.
    * @param {Element} e The element.
@@ -187,27 +161,7 @@ goog.scope(function () {
    * @param {string} styleString The style string.
    */
   DomHelper.prototype.setStyle = function(e, styleString) {
-    if (this.hasSupportForStyle_()) {
-      e.setAttribute("style", styleString);
-    } else {
-      e.style.cssText = styleString;
-    }
-  };
-
-  /**
-   * Check if getting and setting the style attribute on an element with
-   * getAttribute/setAttribute is supported. In old IE, you must use style.cssText
-   * instead. Feature detection is only done the first time this is called.
-   * @private
-   * @return {boolean} Whether or not the feature is supported.
-   */
-  DomHelper.prototype.hasSupportForStyle_ = function() {
-    if (this.supportForStyle_ === undefined) {
-      var e = this.document_.createElement('p');
-      e.innerHTML = '<a style="top:1px;">w</a>';
-      this.supportForStyle_ = /top/.test(e.getElementsByTagName('a')[0].getAttribute('style'));
-    }
-    return this.supportForStyle_
+    e.style.cssText = styleString;
   };
 
   /**
@@ -258,7 +212,7 @@ goog.scope(function () {
    * @return {Element} a DOM element.
    */
   DomHelper.prototype.createStyle = function(css) {
-    var e = this.document_.createElement('style');
+    var e = this.createElement('style');
 
     e.setAttribute('type', 'text/css');
     if (e.styleSheet) { // IE
@@ -269,23 +223,71 @@ goog.scope(function () {
     return e;
   };
 
+  /**
+   * Loads an external stylesheet.
+   *
+   * @param {string} href the URL of the stylesheet
+   * @param {function(Error)=} opt_callback Called when the stylesheet has loaded or failed to
+   * load. Note that the callback is *NOT* guaranteed to be called in all browsers. The first
+   * argument to the callback is an error object that is falsy when there are no errors and
+   * truthy when there are.
+   * @return {Element} The link element
+   */
+  DomHelper.prototype.loadStylesheet = function (href, opt_callback) {
+    var link = this.createElement('link', {
+      'rel': 'stylesheet',
+      'href': href
+    });
+
+    var done = false;
+
+    link.onload = function () {
+      if (!done) {
+        done = true;
+
+        if (opt_callback) {
+          opt_callback(null);
+        }
+      }
+    };
+
+    link.onerror = function () {
+      if (!done) {
+        done = true;
+
+        if (opt_callback) {
+          opt_callback(new Error('Stylesheet failed to load'));
+        }
+      }
+    };
+
+    this.insertInto('head', link);
+
+    return link;
+  };
+
   /**
    * Loads an external script file.
    * @param {string} src URL of the script.
-   * @param {function()=} opt_callback callback when the script has loaded.
+   * @param {function(Error)=} opt_callback callback when the script has loaded. The first argument to
+   * the callback is an error object that is falsy when there are no errors and truthy when there are.
+   * @param {number=} opt_timeout The number of milliseconds after which the callback will be called
+   * with a timeout error. Defaults to 5 seconds.
+   * @return {Element} The script element
    */
-  DomHelper.prototype.loadScript = function(src, opt_callback) {
+  DomHelper.prototype.loadScript = function(src, opt_callback, opt_timeout) {
     var head = this.document_.getElementsByTagName('head')[0];
 
     if (head) {
-      var script = this.document_.createElement('script');
-      script.src = src;
+      var script = this.createElement('script', {
+        'src': src
+      });
       var done = false;
       script.onload = script.onreadystatechange = function() {
         if (!done && (!this.readyState || this.readyState == 'loaded' || this.readyState == 'complete')) {
           done = true;
           if (opt_callback) {
-            opt_callback();
+            opt_callback(null);
           }
           script.onload = script.onreadystatechange = null;
           // Avoid a bizarre issue with unclosed <base> tag in IE6 - http://blog.dotsmart.net/2008/04/
@@ -293,6 +295,19 @@ goog.scope(function () {
         }
       };
       head.appendChild(script);
+
+      window.setTimeout(function () {
+        if (!done) {
+          done = true;
+          if (opt_callback) {
+            opt_callback(new Error('Script load timeout'));
+          }
+        }
+      }, opt_timeout || 5000);
+
+      return script;
     }
+
+    return null;
   };
 });

data/src/core/webfont.js

@@ -60,10 +60,15 @@ goog.scope(function () {
       fontWatcher, support) {
     var that = this;
 
-    if (!support) {
+    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) {
         if (this.moduleFailedLoading_ == 0) {
           eventDispatcher.dispatchInactive();
@@ -72,12 +77,7 @@ goog.scope(function () {
         }
       }
       fontWatcher.watchFonts([], {}, null, allModulesLoaded);
-      return;
     }
-
-    module.load(function (fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
-      that.onModuleReady_(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts);
-    });
   };
 
   /**

data/src/modules/ascender.js

@@ -44,7 +44,7 @@ goog.scope(function () {
     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));
+    this.domHelper_.loadStylesheet(url);
     var fv = this.parseFamiliesAndVariations(this.configuration_['families']);
     onReady(fv);
   };

data/src/modules/custom.js

@@ -30,9 +30,7 @@ goog.scope(function () {
     var familiesConfiguration = this.configuration_['families'] || [];
 
     for (i = 0, len = urls.length; i < len; i++) {
-      var url = urls[i];
-
-      this.domHelper_.insertInto('head', this.domHelper_.createCssLink(url));
+      this.domHelper_.loadStylesheet(urls[i]);
     }
 
     var fonts = [];

data/src/modules/fontdeck.js

@@ -51,11 +51,13 @@ goog.scope(function () {
       };
 
       // Call the Fontdeck API.
-      var script = this.domHelper_.createScriptSrc(this.getScriptSrc(projectId));
-      this.domHelper_.insertInto('head', script);
-
+      this.domHelper_.loadScript(this.getScriptSrc(projectId), function (err) {
+        if (err) {
+          support(false);
+        }
+      });
     } else {
-      support(true);
+      support(false);
     }
   };
 

data/src/modules/google/googlefontapi.js

@@ -54,8 +54,7 @@ goog.scope(function () {
     var fontApiParser = new FontApiParser(fontFamilies);
     fontApiParser.parse();
 
-    domHelper.insertInto('head', domHelper.createCssLink(
-        fontApiUrlBuilder.build()));
+    domHelper.loadStylesheet(fontApiUrlBuilder.build());
     onReady(fontApiParser.getFonts(), fontApiParser.getFontTestStrings(), GoogleFontApi.METRICS_COMPATIBLE_FONTS);
   };
 });

data/src/modules/monotype.js

@@ -49,10 +49,7 @@ goog.scope(function () {
     var projectId = self.configuration_['projectId'];
     var version = self.configuration_['version'];
     if (projectId) {
-      var loadWindow = self.domHelper_.getLoadWindow(),
-          sc = self.domHelper_.createElement("script");
-
-      sc["id"] = Monotype.SCRIPTID + projectId;
+      var loadWindow = self.domHelper_.getLoadWindow();
 
       function onload() {
         if (loadWindow[Monotype.HOOK + projectId]) {
@@ -66,21 +63,17 @@ goog.scope(function () {
         support(userAgent.getBrowserInfo().hasWebFontSupport());
       }
 
-      var done = false;
-
-      sc["onload"] = sc["onreadystatechange"] = function () {
-        if (!done && (!this["readyState"] || this["readyState"] === "loaded" || this["readyState"] === "complete")) {
-          done = true;
+      var script = this.domHelper_.loadScript(self.getScriptSrc(projectId, version), function (err) {
+        if (err) {
+          support(false);
+        } else {
           onload();
-          sc["onload"] = sc["onreadystatechange"] = null;
         }
-      };
-
-      sc["src"] = self.getScriptSrc(projectId, version);
-      this.domHelper_.insertInto('head', sc);
+      });
+      script["id"] = Monotype.SCRIPTID + projectId;
     }
     else {
-      support(true);
+      support(false);
     }
   };
 

data/src/modules/typekit.js

@@ -58,10 +58,13 @@ goog.scope(function () {
       };
 
       // Load the Typekit script.
-      var script = this.domHelper_.createScriptSrc(this.getScriptSrc(kitId))
-      this.domHelper_.insertInto('head', script);
+      this.domHelper_.loadScript(this.getScriptSrc(kitId), function (err) {
+        if (err) {
+          support(false);
+        }
+      }, 2000);
     } else {
-      support(true);
+      support(false);
     }
   };
 

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.9'
-  s.date              = '2013-07-24'
+  s.version           = '1.4.10'
+  s.date              = '2013-07-31'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -68,6 +68,7 @@ DESC
   s.files = %w[
     AUTHORS
     CHANGELOG
+    CONTRIBUTING.md
     Gemfile
     LICENSE
     README.md
@@ -109,7 +110,6 @@ DESC
     spec/core/cssclassname_spec.js
     spec/core/domhelper_spec.js
     spec/core/eventdispatcher_spec.js
-    spec/core/external_script.js
     spec/core/font_spec.js
     spec/core/fontmoduleloader_spec.js
     spec/core/fontruler_spec.js
@@ -120,21 +120,23 @@ DESC
     spec/core/version_spec.js
     spec/core/webfont_spec.js
     spec/deps.js
-    spec/fonts/LICENSE.txt
-    spec/fonts/nullfont.css
-    spec/fonts/nullfont1.css
-    spec/fonts/nullfont2.css
-    spec/fonts/nullfont3.css
-    spec/fonts/sourcesans.eot
-    spec/fonts/sourcesans.otf
-    spec/fonts/sourcesans.svg
-    spec/fonts/sourcesans.ttf
-    spec/fonts/sourcesans.woff
-    spec/fonts/sourcesansa.css
-    spec/fonts/sourcesansb.css
-    spec/fonts/sourcesansc.css
-    spec/fonts/sourcesanscbold.css
-    spec/fonts/sourcesanscbold.otf
+    spec/fixtures/external_script.js
+    spec/fixtures/external_stylesheet.css
+    spec/fixtures/fonts/LICENSE.txt
+    spec/fixtures/fonts/nullfont.css
+    spec/fixtures/fonts/nullfont1.css
+    spec/fixtures/fonts/nullfont2.css
+    spec/fixtures/fonts/nullfont3.css
+    spec/fixtures/fonts/sourcesans.eot
+    spec/fixtures/fonts/sourcesans.otf
+    spec/fixtures/fonts/sourcesans.svg
+    spec/fixtures/fonts/sourcesans.ttf
+    spec/fixtures/fonts/sourcesans.woff
+    spec/fixtures/fonts/sourcesansa.css
+    spec/fixtures/fonts/sourcesansb.css
+    spec/fixtures/fonts/sourcesansc.css
+    spec/fixtures/fonts/sourcesanscbold.css
+    spec/fixtures/fonts/sourcesanscbold.otf
     spec/index.html
     spec/modules/ascender_spec.js
     spec/modules/custom_spec.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 4
-  - 9
-  version: 1.4.9
+  - 10
+  version: 1.4.10
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-24 00:00:00 Z
+date: 2013-07-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -96,6 +96,7 @@ extra_rdoc_files:
 files: 
 - AUTHORS
 - CHANGELOG
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -137,7 +138,6 @@ files:
 - spec/core/cssclassname_spec.js
 - spec/core/domhelper_spec.js
 - spec/core/eventdispatcher_spec.js
-- spec/core/external_script.js
 - spec/core/font_spec.js
 - spec/core/fontmoduleloader_spec.js
 - spec/core/fontruler_spec.js
@@ -148,21 +148,23 @@ files:
 - spec/core/version_spec.js
 - spec/core/webfont_spec.js
 - spec/deps.js
-- spec/fonts/LICENSE.txt
-- spec/fonts/nullfont.css
-- spec/fonts/nullfont1.css
-- spec/fonts/nullfont2.css
-- spec/fonts/nullfont3.css
-- spec/fonts/sourcesans.eot
-- spec/fonts/sourcesans.otf
-- spec/fonts/sourcesans.svg
-- spec/fonts/sourcesans.ttf
-- spec/fonts/sourcesans.woff
-- spec/fonts/sourcesansa.css
-- spec/fonts/sourcesansb.css
-- spec/fonts/sourcesansc.css
-- spec/fonts/sourcesanscbold.css
-- spec/fonts/sourcesanscbold.otf
+- spec/fixtures/external_script.js
+- spec/fixtures/external_stylesheet.css
+- spec/fixtures/fonts/LICENSE.txt
+- spec/fixtures/fonts/nullfont.css
+- spec/fixtures/fonts/nullfont1.css
+- spec/fixtures/fonts/nullfont2.css
+- spec/fixtures/fonts/nullfont3.css
+- spec/fixtures/fonts/sourcesans.eot
+- spec/fixtures/fonts/sourcesans.otf
+- spec/fixtures/fonts/sourcesans.svg
+- spec/fixtures/fonts/sourcesans.ttf
+- spec/fixtures/fonts/sourcesans.woff
+- spec/fixtures/fonts/sourcesansa.css
+- spec/fixtures/fonts/sourcesansb.css
+- spec/fixtures/fonts/sourcesansc.css
+- spec/fixtures/fonts/sourcesanscbold.css
+- spec/fixtures/fonts/sourcesanscbold.otf
 - spec/index.html
 - spec/modules/ascender_spec.js
 - spec/modules/custom_spec.js