webfontloader 1.4.10 → 1.4.11

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.4.11 (August 8, 2013)
+* Remove Ascender module (according to Monotype the service has now been shutdown completely.)
+* Switch Monotype module to use fast.fonts.net instead of fast.fonts.com
+* Update license
+
 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

data/LICENSE

@@ -174,28 +174,3 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [2010] [Small Batch Inc]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

data/README.md

@@ -1,6 +1,6 @@
 # Web Font Loader
 
-Web Font Loader gives you added control when using linked fonts via `@font-face`. It provides a common interface to loading fonts regardless of the source, then adds a standard set of events you may use to control the loading experience. The Web Font Loader is able to load fonts from [Google Fonts](http://www.google.com/fonts/), [Typekit](http://www.typekit.com/), [Ascender](http://www.ascenderfonts.com/webfonts/), [Fonts.com](http://www.fonts.com/), and [Fontdeck](http://fontdeck.com/), as well as self-hosted web fonts. It is co-developed by [Google](http://www.google.com/) and [Typekit](http://www.typekit.com).
+Web Font Loader gives you added control when using linked fonts via `@font-face`. It provides a common interface to loading fonts regardless of the source, then adds a standard set of events you may use to control the loading experience. The Web Font Loader is able to load fonts from [Google Fonts](http://www.google.com/fonts/), [Typekit](http://www.typekit.com/),  [Fonts.com](http://www.fonts.com/), and [Fontdeck](http://fontdeck.com/), as well as self-hosted web fonts. It is co-developed by [Google](http://www.google.com/) and [Typekit](http://www.typekit.com).
 
 [![Build Status](https://travis-ci.org/typekit/webfontloader.png?branch=master)](https://travis-ci.org/typekit/webfontloader)
 
@@ -12,7 +12,6 @@ Web Font Loader gives you added control when using linked fonts via `@font-face`
     * [Timeout](#timeout)
     * [Iframes](#iframes)
 * [Modules](#modules)
-    * [Ascender](#ascender)
     * [Custom](#custom)
     * [Fontdeck](#fontdeck)
     * [Fonts.com](#fonts.com)
@@ -139,19 +138,6 @@ This is an advanced configuration option that isn't needed for most use cases.
 
 Web Font Loader provides a module system so that any web font provider can contribute code that allows their fonts to be loaded. This makes it possible to use multiple web font providers at the same time. The specifics of each provider currently supported by the library are documented here.
 
-### Ascender
-
-To load fonts from the FontsLive service use the `ascender` module.
-
-    WebFontConfig = {
-      ascender: {
-        key: 'myAscenderKey',
-        families: [ 'AscenderSans:bold,bolditalic,italic,regular' ]
-      }
-    };
-
-**NOTE**: The Ascender font service has been acquired by Monotype (Fonts.com) and as such the use of the Fonts.com module is recommended.
-
 ### Custom
 
 To load fonts from any external stylesheet, use the `custom` module. Here you'll
@@ -269,6 +255,12 @@ 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.
 
-## License
+## Copyright and License
+
+Web Font Loader Copyright (c) 2010 Adobe Systems Incorporated, Google Incorporated.
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
 
-Web Font Loader is released under the [Apache 2.0](http://github.com/typekit/webfontloader/blob/master/LICENSE) license.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

data/lib/webfontloader/demo/public/index.html

@@ -23,9 +23,8 @@
     <li><a href="/google.html">Google / Web Font Loader</a>: Load fonts from Google with Web Font Loader.</li>
     <li><a href="/typekit.html">Typekit / Web Font Loader</a>: Load fonts from Typekit with Web Font Loader.</li>
     <li><a href="/custom.html">Custom / Web Font Loader</a>: Load fonts from your own CSS with Web Font Loader.</li>
-    <li><a href="/ascender.html">Ascender / Web Font Loader</a>: Load fonts from Ascender with Web Font Loader.</li>
     <li><a href="/fontdeck.html">Fontdeck / Web Font Loader</a>: Load fonts from Fontdeck with Web Font Loader.</li>
-    <li><a href="/monotype.html">Monotype / Web Font Loader</a>: Load fonts from webfonts.fonts.com with Web Font Loader.</li>
+    <li><a href="/monotype.html">Monotype / Web Font Loader</a>: Load fonts from fonts.com with Web Font Loader.</li>
   </ol>
 
   <h2>Modules in Iframes</h2>
@@ -36,9 +35,8 @@
     <li><a href="/google-iframe.html">Google / Web Font Loader</a>: Load fonts from Google in a child iframe with Web Font Loader.</li>
     <li><a href="/typekit-iframe.html">Typekit / Web Font Loader</a>: Load fonts from Typekit in a child iframe with Web Font Loader.</li>
     <li><a href="/custom-iframe.html">Custom / Web Font Loader</a>: Load fonts from your own CSS in a child iframe with Web Font Loader.</li>
-    <li><a href="/ascender-iframe.html">Ascender / Web Font Loader</a>: Load fonts from Ascender in a child iframe with Web Font Loader.</li>
     <li>Fontdeck / Web Font Loader: Their demo fonts seem to be broken at the moment, so we don't have an iframe demo of this module.</li>
-    <li><a href="/monotype-iframe.html">Monotype / Web Font Loader</a>: Load fonts from webfonts.fonts.com in a child iframe with Web Font Loader.</li>
+    <li><a href="/monotype-iframe.html">Monotype / Web Font Loader</a>: Load fonts from fonts.com in a child iframe with Web Font Loader.</li>
   </ol>
 
   <h2>Events</h2>

data/lib/webfontloader.rb

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

data/spec/deps.js

@@ -16,7 +16,6 @@ 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"]);
-goog.addDependency("../../src/modules/ascender.js", ["webfont.modules.Ascender"], ["webfont.Font"]);
 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 @@
       // Require the modules because they don't have an explicit
       // dependency on core.
       goog.require('webfont.modules.Typekit');
-      goog.require('webfont.modules.Ascender');
       goog.require('webfont.modules.Fontdeck');
       goog.require('webfont.modules.Monotype');
       goog.require('webfont.modules.Custom');
@@ -51,7 +50,6 @@
     <script src="../spec/modules/google/fontapiurlbuilder_spec.js"></script>
     <script src="../spec/modules/google/googlefontapi_spec.js"></script>
     <script src="../spec/modules/custom_spec.js"></script>
-    <script src="../spec/modules/ascender_spec.js"></script>
     <script src="../spec/modules/fontdeck_spec.js"></script>
     <script src="../spec/modules/monotype_spec.js"></script>
     <script src="../spec/modules/typekit_spec.js"></script>

data/spec/modules/monotype_spec.js

@@ -7,7 +7,7 @@ describe('modules.Monotype', function () {
 
   var configuration = {
     projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc',
-    api: 'http://fast.fonts.com/jsapidev'
+    api: 'http://fast.fonts.net/jsapidev'
   };
 
   var fakeDomHelper = null,
@@ -60,7 +60,7 @@ 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.com/jsapidev/01e2ff27-25bf-4801-a23e-73d328e6c7cc.js');
+    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/src/modules/monotype.js

@@ -79,7 +79,7 @@ goog.scope(function () {
 
   Monotype.prototype.getScriptSrc = function (projectId, version) {
     var p = this.domHelper_.getProtocol();
-    var api = (this.configuration_['api'] || 'fast.fonts.com/jsapi').replace(/^.*http(s?):(\/\/)?/, "");
+    var api = (this.configuration_['api'] || 'fast.fonts.net/jsapi').replace(/^.*http(s?):(\/\/)?/, "");
     return p + "//" + api + '/' + projectId + '.js' + ( version ? '?v='+ version : '' );
   };
 

data/src/modules.yml

@@ -16,8 +16,7 @@ core:
   - core/webfont.js
   - core/initialize.js
 
-ascender:
-  - modules/ascender.js
+
 
 google:
   - modules/google/fontapiurlbuilder.js

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.10'
-  s.date              = '2013-07-31'
+  s.version           = '1.4.11'
+  s.date              = '2013-08-08'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -75,8 +75,6 @@ DESC
     Rakefile
     bin/webfontloader-demos
     lib/webfontloader.rb
-    lib/webfontloader/demo/public/ascender-iframe.html
-    lib/webfontloader/demo/public/ascender.html
     lib/webfontloader/demo/public/basic.css
     lib/webfontloader/demo/public/blank.html
     lib/webfontloader/demo/public/custom-iframe.html
@@ -138,7 +136,6 @@ DESC
     spec/fixtures/fonts/sourcesanscbold.css
     spec/fixtures/fonts/sourcesanscbold.otf
     spec/index.html
-    spec/modules/ascender_spec.js
     spec/modules/custom_spec.js
     spec/modules/fontdeck_spec.js
     spec/modules/google/fontapiparser_spec.js
@@ -164,7 +161,6 @@ DESC
     src/core/version.js
     src/core/webfont.js
     src/modules.yml
-    src/modules/ascender.js
     src/modules/custom.js
     src/modules/fontdeck.js
     src/modules/google/fontapiparser.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 4
-  - 10
-  version: 1.4.10
+  - 11
+  version: 1.4.11
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-31 00:00:00 Z
+date: 2013-08-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -103,8 +103,6 @@ files:
 - Rakefile
 - bin/webfontloader-demos
 - lib/webfontloader.rb
-- lib/webfontloader/demo/public/ascender-iframe.html
-- lib/webfontloader/demo/public/ascender.html
 - lib/webfontloader/demo/public/basic.css
 - lib/webfontloader/demo/public/blank.html
 - lib/webfontloader/demo/public/custom-iframe.html
@@ -166,7 +164,6 @@ files:
 - spec/fixtures/fonts/sourcesanscbold.css
 - spec/fixtures/fonts/sourcesanscbold.otf
 - spec/index.html
-- spec/modules/ascender_spec.js
 - spec/modules/custom_spec.js
 - spec/modules/fontdeck_spec.js
 - spec/modules/google/fontapiparser_spec.js
@@ -192,7 +189,6 @@ files:
 - src/core/version.js
 - src/core/webfont.js
 - src/modules.yml
-- src/modules/ascender.js
 - src/modules/custom.js
 - src/modules/fontdeck.js
 - src/modules/google/fontapiparser.js

data/lib/webfontloader/demo/public/ascender-iframe.html

@@ -1,46 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Ascender Module Demo</title>
-  <link href="/basic.css" rel="stylesheet" type="text/css">
-  <script type="text/javascript" src="/webfont.js"></script>
-  <style type="text/css">
-    iframe {
-      height: 100px;
-      width: 100%;
-    }
-  </style>
-</head>
-<body>
-  <script type="text/javascript">
-    function loaded() {
-      var child = frames["child"];
-      child.document.body.innerHTML = "<h1 style=\"font-family: 'AyitaPro'\">Hello World. I am Ayita Pro.</h1>";
-      WebFont.load({
-        ascender: {
-          key:'ec2de397-11ae-4c10-937f-bf94283a70c1',
-          families:['AyitaPro:regular,bold,bolditalic,italic']
-        },
-        context: child
-      });
-    }
-  </script>
-
-  <iframe name="child" src="/blank.html" onload="loaded()"></iframe>
-
-  <hr>
-
-  <p>
-    <a href="#" onclick="document.getElementsByTagName('body')[0].style.color = '#fff';return false;">Hide Page</a> |
-    <a href="/ascender.html">Reload Cached</a>
-  </p>
-  <p>
-    Note: use "localhost" when testing web fonts.
-  </p>
-  <p>
-    The goal of this page is to show how fonts load from Ascender in a child
-    iframe.
-  </p>
-
-</body>
-</html>

data/lib/webfontloader/demo/public/ascender.html

@@ -1,99 +0,0 @@
-<!doctype html>
-<html>
-<head>
-  <title>Ascender Module Demo</title>
-  <link href="/basic.css" rel="stylesheet" type="text/css">
-  <script type="text/javascript" src="/webfont.js"></script>
-  <style type="text/css">
-    /* Use classes to prove that Ascender module triggers the event system correctly */
-    #demo {
-      visibility: hidden;
-      line-height:normal;
-    }
-    .wf-ayitapro-n4-active #demo {
-      font-family: 'AyitaPro';
-      visibility: visible;
-    }
-  </style>
-</head>
-<body>
-  <div id="demo">
-    <h1>Hello World. I am Ayita Pro.</h1>
-
-    <h2>Regular:</h2>
-    <p style="font-weight:normal; font-style:normal;">
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur tempus eleifend aliquam. Nullam eu volutpat orci. Sed scelerisque pulvinar lorem, non ornare risus varius sed. Integer in lorem ut tortor rutrum placerat. Duis quis ante nec nulla luctus tincidunt. Aenean lorem metus, venenatis id sagittis eget, sodales ut justo. Donec quis dictum erat. Nunc ac feugiat sapien. In laoreet nisl in nisl ullamcorper porttitor. Ut vitae tortor leo, nec euismod sapien. Vivamus pellentesque, est in vulputate dictum, lectus diam interdum ipsum, sit amet posuere libero dui et sapien. Curabitur sit amet pulvinar massa.
-    </p>
-
-    <h2>Bold:</h2>
-    <p style="font-weight:bold; font-style:normal;">
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur tempus eleifend aliquam. Nullam eu volutpat orci. Sed scelerisque pulvinar lorem, non ornare risus varius sed. Integer in lorem ut tortor rutrum placerat. Duis quis ante nec nulla luctus tincidunt. Aenean lorem metus, venenatis id sagittis eget, sodales ut justo. Donec quis dictum erat. Nunc ac feugiat sapien. In laoreet nisl in nisl ullamcorper porttitor. Ut vitae tortor leo, nec euismod sapien. Vivamus pellentesque, est in vulputate dictum, lectus diam interdum ipsum, sit amet posuere libero dui et sapien. Curabitur sit amet pulvinar massa.
-    </p>
-
-    <h2>Italic:</h2>
-    <p style="font-weight:normal; font-style:italic;">
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur tempus eleifend aliquam. Nullam eu volutpat orci. Sed scelerisque pulvinar lorem, non ornare risus varius sed. Integer in lorem ut tortor rutrum placerat. Duis quis ante nec nulla luctus tincidunt. Aenean lorem metus, venenatis id sagittis eget, sodales ut justo. Donec quis dictum erat. Nunc ac feugiat sapien. In laoreet nisl in nisl ullamcorper porttitor. Ut vitae tortor leo, nec euismod sapien. Vivamus pellentesque, est in vulputate dictum, lectus diam interdum ipsum, sit amet posuere libero dui et sapien. Curabitur sit amet pulvinar massa.
-    </p>
-
-    <h2>Bold Italic:</h2>
-    <p style="font-weight:bold; font-style:italic;">
-      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur tempus eleifend aliquam. Nullam eu volutpat orci. Sed scelerisque pulvinar lorem, non ornare risus varius sed. Integer in lorem ut tortor rutrum placerat. Duis quis ante nec nulla luctus tincidunt. Aenean lorem metus, venenatis id sagittis eget, sodales ut justo. Donec quis dictum erat. Nunc ac feugiat sapien. In laoreet nisl in nisl ullamcorper porttitor. Ut vitae tortor leo, nec euismod sapien. Vivamus pellentesque, est in vulputate dictum, lectus diam interdum ipsum, sit amet posuere libero dui et sapien. Curabitur sit amet pulvinar massa.
-    </p>
-  </div>
-  <hr>
-  <p>
-    <a href="#" onclick="document.getElementsByTagName('body')[0].style.color = '#fff';return false;">Hide Page</a> |
-    <a href="/ascender.html">Reload Cached</a>
-  </p>
-  <p>
-    Note: use "localhost" when testing web fonts.
-  </p>
-  <p>
-    The goal of this page is to show how fonts load from Ascender.
-  </p>
-  <h2>JavaScript Event Progress</h2>
-  <ol id="events"></ol>
-
-  <script type="text/javascript">
-    function progress(message) {
-      var output = document.getElementById('events');
-      if (output) {
-        var e = document.createElement('li');
-        e.innerHTML = message;
-        output.appendChild(e);
-      }
-      if (window.console && window.console.log) {
-        window.console.log(message);
-      }
-    }
-
-    //Families must match families
-    //that are included in provided CSS
-    WebFont.load({
-      ascender: {
-        key:'ec2de397-11ae-4c10-937f-bf94283a70c1',
-        families:['AyitaPro:regular,bold,bolditalic,italic']
-      },
-      loading: function() {
-        progress('loading');
-      },
-      active: function() {
-        progress('active');
-      },
-      inactive: function() {
-        progress('inactive');
-      },
-      fontloading: function(fontFamily, fontDescription) {
-        progress('fontloading: ' + fontFamily + ' (' + fontDescription + ')');
-      },
-      fontactive: function(fontFamily, fontDescription) {
-        progress('fontactive: ' + fontFamily + ' (' + fontDescription + ')');
-      },
-      fontinactive: function(fontFamily, fontDescription) {
-        progress('fontinactive: ' + fontFamily + ' (' + fontDescription + ')');
-      }
-    });
-  </script>
-
-</body>
-</html>

data/spec/modules/ascender_spec.js

@@ -1,64 +0,0 @@
-describe('modules.Ascender', function () {
-  var Ascender = webfont.modules.Ascender,
-      Font = webfont.Font;
-
-  var configuration = {
-    key: 'ec2de397-11ae-4c10-937f-bf94283a70c1',
-    families: ['AndyBold', 'Arial:bold,regular']
-  };
-
-  describe('load family and variations', function () {
-    var fakeDomHelper = null,
-        fakeOnReady = null,
-        ascender = null;
-
-    beforeEach(function () {
-      fakeDomHelper = {
-        loadStylesheet: jasmine.createSpy('createCssLink'),
-        getProtocol: jasmine.createSpy('getProtocol').andReturn('http:')
-      };
-
-      fakeOnReady = jasmine.createSpy('onReady');
-
-      ascender = new Ascender(fakeDomHelper, configuration);
-      ascender.load(fakeOnReady);
-    });
-
-    it('should create the link correctly', function () {
-      expect(fakeDomHelper.loadStylesheet).toHaveBeenCalledWith('http://webfonts.fontslive.com/css/ec2de397-11ae-4c10-937f-bf94283a70c1.css');
-    });
-
-    it('should pass the fonts correctly', function () {
-      expect(fakeOnReady).toHaveBeenCalledWith([
-        new Font('AndyBold', 'n4'),
-        new Font('Arial', 'n7'),
-        new Font('Arial', 'n4')
-      ]);
-    });
-
-    it('should parse variations correctly', function () {
-      expect(ascender.parseVariations('regular')).toEqual(['n4']);
-      expect(ascender.parseVariations('bold')).toEqual(['n7']);
-      expect(ascender.parseVariations('italic')).toEqual(['i4']);
-      expect(ascender.parseVariations('bolditalic')).toEqual(['i7']);
-      expect(ascender.parseVariations('regular,')).toEqual(['n4']);
-      expect(ascender.parseVariations('regular,bold')).toEqual(['n4', 'n7']);
-      expect(ascender.parseVariations('regular,,bold')).toEqual(['n4', 'n7']);
-      expect(ascender.parseVariations('n4,n7')).toEqual(['n4', 'n7']);
-    });
-
-    it('should parse font families correctly', function () {
-      expect(ascender.parseFamilyAndVariations('Arial')).toEqual([new Font('Arial')]);
-      expect(ascender.parseFamilyAndVariations('Arial:bold,regular')).toEqual([new Font('Arial', 'n7'), new Font('Arial', 'n4')]);
-      expect(ascender.parseFamilyAndVariations('Arial:n4,n7')).toEqual([new Font('Arial', 'n4'), new Font('Arial', 'n7')]);
-    });
-
-    it('should parse multiple font families correctly', function () {
-      expect(ascender.parseFamiliesAndVariations(['Arial', 'Sans:n4,n7'])).toEqual([
-        new Font('Arial', 'n4'),
-        new Font('Sans', 'n4'),
-        new Font('Sans', 'n7')
-      ]);
-    });
-  })
-});

data/src/modules/ascender.js

@@ -1,107 +0,0 @@
-goog.provide('webfont.modules.Ascender');
-
-goog.require('webfont.Font');
-
-/**
- *
- * WebFont.load({
- *   ascender: {
- *     key:'ec2de397-11ae-4c10-937f-bf94283a70c1',
- *     families:['AyitaPro:regular,bold,bolditalic,italic']
- *   }
- * });
- *
- * @constructor
- * @implements {webfont.FontModule}
- */
-webfont.modules.Ascender = function(domHelper, configuration) {
-  this.domHelper_ = domHelper;
-  this.configuration_ = configuration;
-};
-
-webfont.modules.Ascender.NAME = 'ascender';
-
-webfont.modules.Ascender.VARIATIONS = {
-  'regular': 'n4',
-  'bold': 'n7',
-  'italic': 'i4',
-  'bolditalic': 'i7',
-  'r': 'n4',
-  'b': 'n7',
-  'i': 'i4',
-  'bi': 'i7'
-};
-
-goog.scope(function () {
-  var Ascender = webfont.modules.Ascender,
-      Font = webfont.Font;
-
-  Ascender.prototype.supportUserAgent = function(userAgent, support) {
-    return support(userAgent.getBrowserInfo().hasWebFontSupport());
-  };
-
-  Ascender.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_.loadStylesheet(url);
-    var fv = this.parseFamiliesAndVariations(this.configuration_['families']);
-    onReady(fv);
-  };
-
-  /**
-   * @param {Array.<string>} providedFamilies
-   * @return {Array.<webfont.Font>}
-   */
-  Ascender.prototype.parseFamiliesAndVariations = function (providedFamilies) {
-    var fonts = [];
-
-    for (var i = 0, len = providedFamilies.length; i < len; i++) {
-      fonts.push.apply(fonts, this.parseFamilyAndVariations(providedFamilies[i]));
-    }
-    return fonts;
-  };
-
-  /**
-   * @param {string} providedFamily
-   * @return {Array.<webfont.Font>}
-   */
-  Ascender.prototype.parseFamilyAndVariations = function (providedFamily){
-    var parts = providedFamily.split(':'),
-        familyName = parts[0];
-
-    if (parts[1]) {
-      var variations = this.parseVariations(parts[1]),
-          result = [];
-
-      for (var i = 0; i < variations.length; i += 1) {
-        result.push(new Font(familyName, variations[i]));
-      }
-      return result;
-    }
-    return [new Font(familyName)];
-  };
-
-  /**
-   * @param {string} source
-   * @return {Array.<string>}
-   */
-  Ascender.prototype.parseVariations = function (source) {
-    var providedVariations = source.split(','),
-        variations = [];
-
-    for (var i = 0, len = providedVariations.length; i < len; i++){
-      var pv = providedVariations[i];
-
-      if (pv) {
-        var v = Ascender.VARIATIONS[pv];
-        variations.push(v ? v : pv);
-      }
-    }
-    return variations;
-  };
-});
-
-globalNamespaceObject.addModule(webfont.modules.Ascender.NAME, function(configuration, domHelper) {
-  return new webfont.modules.Ascender(domHelper, configuration);
-});