webfontloader 1.4.0 → 1.4.1

data/spec/google/googlefontapi_spec.js

@@ -1,5 +1,6 @@
 describe('GoogleFontApi', function () {
   var GoogleFontApi = webfont.GoogleFontApi,
+      Font = webfont.Font,
       UserAgent = webfont.UserAgent,
       userAgent = null,
       link = '',
@@ -25,14 +26,12 @@ describe('GoogleFontApi', function () {
 
   describe('call onReady with font family loading', function () {
     var googleFontApi = null,
-        families = null,
-        descriptions = null;
+        fonts = null;
 
     beforeEach(function () {
       googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1', 'Font2'] });
-      googleFontApi.load(function (fontFamilies, fontDescriptions) {
-        families = fontFamilies;
-        descriptions = fontDescriptions;
+      googleFontApi.load(function (f) {
+        fonts = f;
       });
     });
 
@@ -42,39 +41,22 @@ describe('GoogleFontApi', function () {
     });
 
     it('has the correct families', function () {
-      expect(families).not.toBeNull();
-      expect(families.length).toEqual(2);
-      expect(families[0]).toEqual('Font1');
-      expect(families[1]).toEqual('Font2');
-    });
-
-    it('has the correct font descriptions', function () {
-      var font1 = descriptions['Font1'];
-      expect(font1).not.toBeNull();
-      expect(font1.length).toEqual(1);
-      expect(font1[0]).toEqual('n4');
-
-      var font2 = descriptions['Font2'];
-      expect(font2).not.toBeNull();
-      expect(font2.length).toEqual(1);
-      expect(font1[0]).toEqual('n4');
+      expect(fonts).not.toBeNull();
+      expect(fonts.length).toEqual(2);
+      expect(fonts[0]).toEqual(new Font('Font1'));
+      expect(fonts[1]).toEqual(new Font('Font2'));
     });
   });
 
   describe('call onReady with font family loading and custom API url', function () {
-    var googleFontApi = null,
-        families = null,
-        descriptions = null;
+    var googleFontApi = null;
 
     beforeEach(function () {
       googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, {
         api: 'http://moo',
         families: ['Font1', 'Font2']
       });
-      googleFontApi.load(function (fontFamilies, fontDescriptions) {
-        families = fontFamilies;
-        descriptions = fontDescriptions;
-      });
+      googleFontApi.load(function () {});
     });
 
     it('has inserted the link element correctly', function () {
@@ -84,16 +66,11 @@ describe('GoogleFontApi', function () {
   });
 
   describe('spaces replaced by plus', function () {
-    var googleFontApi = null,
-        families = null,
-        descriptions = null;
+    var googleFontApi = null;
 
     beforeEach(function () {
       googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1 WithSpace', 'Font2 WithSpaceToo'] });
-      googleFontApi.load(function (fontFamilies, fontDescriptions) {
-        families = fontFamilies;
-        descriptions = fontDescriptions;
-      });
+      googleFontApi.load(function () {});
     });
 
     it('has inserted the link element correctly', function () {
@@ -103,16 +80,11 @@ describe('GoogleFontApi', function () {
  });
 
   describe('load with variations', function () {
-    var googleFontApi = null,
-        families = null,
-        descriptions = null;
+    var googleFontApi = null;
 
     beforeEach(function () {
       googleFontApi = new GoogleFontApi(userAgent, fakeDomHelper, { families: ['Font1 WithSpace:bi', 'Font2 WithSpaceToo:b,r'] });
-      googleFontApi.load(function (fontFamilies, fontDescriptions) {
-        families = fontFamilies;
-        descriptions = fontDescriptions;
-      });
+      googleFontApi.load(function () {});
     });
 
     it('has inserted the link element correctly', function () {

data/spec/google/lastresortwebkitfontwatchrunner_spec.js

@@ -3,9 +3,9 @@ describe('LastResortWebKitFontWatchRunner', function () {
       BrowserInfo = webfont.BrowserInfo,
       DomHelper = webfont.DomHelper,
       FontRuler = webfont.FontRuler,
+      Font = webfont.Font,
       domHelper = new DomHelper(window),
-      fontFamily = 'My Family',
-      fontDescription = 'n4';
+      font = new Font('My Family', 'n4');
 
   var TARGET_SIZE = 3,
       FALLBACK_SIZE_A = 1,
@@ -74,12 +74,12 @@ describe('LastResortWebKitFontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fontFamily, fontDescription, browserInfo);
+        domHelper, font, browserInfo);
 
     fontWatchRunner.start();
 
     jasmine.Clock.tick(1 * 25);
-    expect(activeCallback).toHaveBeenCalledWith('My Family', 'n4');
+    expect(activeCallback).toHaveBeenCalledWith(font);
   });
 
   it('should consider last resort font as having identical metrics and call active', function () {
@@ -90,13 +90,15 @@ describe('LastResortWebKitFontWatchRunner', function () {
 
     timesToGetTimeBeforeTimeout = 2;
 
+    var arimo = new Font('Arimo');
+
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, 'Arimo', fontDescription, browserInfo);
+        domHelper, arimo, browserInfo);
 
     fontWatchRunner.start();
 
     jasmine.Clock.tick(1 * 25);
-    expect(activeCallback).toHaveBeenCalledWith('Arimo', 'n4');
+    expect(activeCallback).toHaveBeenCalledWith(arimo);
   });
 
   it('should fail to load font and call inactive', function () {
@@ -109,12 +111,12 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 3;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fontFamily, fontDescription, browserInfo);
+        domHelper, font, browserInfo);
 
     fontWatchRunner.start();
 
     jasmine.Clock.tick(2 * 25);
-    expect(inactiveCallback).toHaveBeenCalledWith('My Family', 'n4');
+    expect(inactiveCallback).toHaveBeenCalledWith(font);
   });
 
   it('should call inactive when we are loading a metric incompatible font', function () {
@@ -126,10 +128,10 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 2;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fontFamily, fontDescription, browserInfo);
+        domHelper, font, browserInfo);
 
     fontWatchRunner.start();
     jasmine.Clock.tick(1 * 25);
-    expect(inactiveCallback).toHaveBeenCalledWith('My Family', 'n4');
+    expect(inactiveCallback).toHaveBeenCalledWith(font);
   });
 });

data/spec/index.html

@@ -9,6 +9,9 @@
     <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">
  </head>
   <body>
     <script src="../tools/jasmine/jasmine.js"></script>
@@ -32,15 +35,14 @@
 
     <script src="../spec/core/domhelper_spec.js"></script>
     <script src="../spec/core/cssclassname_spec.js"></script>
-    <script src="../spec/core/cssfontfamilyname_spec.js"></script>
-    <script src="../spec/core/fontvariationdescription_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>
     <script src="../spec/core/fontruler_spec.js"></script>
     <script src="../spec/core/fontwatchrunner_spec.js"></script>
     <script src="../spec/core/fontwatcher_spec.js"></script>
-    <script src="../spec/core/font_spec.js"></script>
+    <script src="../spec/core/webfont_spec.js"></script>
     <script src="../spec/google/fontapiparser_spec.js"></script>
     <script src="../spec/google/fontapiurlbuilder_spec.js"></script>
     <script src="../spec/google/googlefontapi_spec.js"></script>

data/spec/monotype/monotypescript_spec.js

@@ -1,5 +1,6 @@
 describe('MonotypeScript', function () {
   var MonotypeScript = webfont.MonotypeScript,
+      Font = webfont.Font,
       BrowserInfo = webfont.BrowserInfo,
       UserAgent = webfont.UserAgent;
 
@@ -34,7 +35,7 @@ describe('MonotypeScript', function () {
     monotype.load(load);
 
     global[MonotypeScript.HOOK + configuration.projectId] = function () {
-      return ['aachen bold', 'kid print regular'];
+      return [{fontfamily: 'aachen bold'}, {fontfamily: 'kid print regular'}];
     };
 
     script.onload();
@@ -44,6 +45,6 @@ describe('MonotypeScript', 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(load).toHaveBeenCalledWith([undefined, undefined], {});
+    expect(load).toHaveBeenCalledWith([new Font('aachen bold'), new Font('kid print regular')]);
   });
 });

data/spec/typekit/typekitscript_spec.js

@@ -1,5 +1,6 @@
 describe('TypekitScript', function () {
-  var TypekitScript = webfont.TypekitScript;
+  var TypekitScript = webfont.TypekitScript,
+      Font = webfont.Font;
 
   var configuration = {
     id: 'abc'
@@ -48,7 +49,7 @@ describe('TypekitScript', function () {
 
     typekit.load(load);
 
-    expect(load).toHaveBeenCalledWith(['Font1', 'Font2'], { 'Font1': undefined, 'Font2': undefined });
+    expect(load).toHaveBeenCalledWith([new Font('Font1'), new Font('Font2')]);
   });
 
   it('should load with variations', function () {
@@ -66,7 +67,11 @@ describe('TypekitScript', function () {
 
     typekit.load(load);
 
-    expect(load).toHaveBeenCalledWith(['Font1', 'Font2'], { 'Font1': ['n7', 'i7'], 'Font2': undefined });
+    expect(load).toHaveBeenCalledWith([
+      new Font('Font1', 'n7'),
+      new Font('Font1', 'i7'),
+      new Font('Font2', 'n4')
+    ]);
   });
 
   it('should load through the alternative API', function () {
@@ -88,6 +93,6 @@ describe('TypekitScript', function () {
 
     typekit.load(load);
 
-    expect(load).toHaveBeenCalledWith([], {});
+    expect(load).toHaveBeenCalledWith([]);
   });
 });

data/src/ascender/ascender_script.js

@@ -1,5 +1,7 @@
 goog.provide('webfont.AscenderScript');
 
+goog.require('webfont.Font');
+
 /**
  *
  * WebFont.load({
@@ -31,7 +33,8 @@ webfont.AscenderScript.VARIATIONS = {
 };
 
 goog.scope(function () {
-  var AscenderScript = webfont.AscenderScript;
+  var AscenderScript = webfont.AscenderScript,
+      Font = webfont.Font;
 
   AscenderScript.prototype.supportUserAgent = function(userAgent, support) {
     return support(userAgent.getBrowserInfo().hasWebFontSupport());
@@ -43,40 +46,54 @@ goog.scope(function () {
     var url = protocol + '//webfonts.fontslive.com/css/' + key + '.css';
     this.domHelper_.insertInto('head', this.domHelper_.createCssLink(url));
     var fv = this.parseFamiliesAndVariations(this.configuration_['families']);
-    onReady(fv.families, fv.variations);
+    onReady(fv);
   };
 
-  AscenderScript.prototype.parseFamiliesAndVariations = function(providedFamilies){
-    var families, variations, fv;
-    families = [];
-    variations = {};
-    for(var i = 0, len = providedFamilies.length; i < len; i++){
-      fv = this.parseFamilyAndVariations(providedFamilies[i]);
-      families.push(fv.family);
-      variations[fv.family] = fv.variations;
+  /**
+   * @param {Array.<string>} providedFamilies
+   * @return {Array.<webfont.Font>}
+   */
+  AscenderScript.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 { families:families, variations:variations };
+    return fonts;
   };
 
-  AscenderScript.prototype.parseFamilyAndVariations = function(providedFamily){
-    var family, variations, parts;
-    parts = providedFamily.split(':');
-    family = parts[0];
-    variations = [];
-    if(parts[1]){
-      variations = this.parseVariations(parts[1]);
-    }else{
-      variations = ['n4'];
+  /**
+   * @param {string} providedFamily
+   * @return {Array.<webfont.Font>}
+   */
+  AscenderScript.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 { family:family, variations:variations };
+    return [new Font(familyName)];
   };
 
-  AscenderScript.prototype.parseVariations = function(source){
-    var providedVariations = source.split(',');
-    var variations = [];
-    for(var i = 0, len = providedVariations.length; i < len; i++){
+  /**
+   * @param {string} source
+   * @return {Array.<string>}
+   */
+  AscenderScript.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){
+
+      if (pv) {
         var v = AscenderScript.VARIATIONS[pv];
         variations.push(v ? v : pv);
       }

data/src/core/eventdispatcher.js

@@ -68,58 +68,55 @@ goog.scope(function () {
 
   /**
    * Dispatch the font loading event and append the font loading class name.
-   * @param {string} fontFamily
-   * @param {string} fontDescription
+   * @param {webfont.Font} font
    */
-  EventDispatcher.prototype.dispatchFontLoading = function(fontFamily, fontDescription) {
+  EventDispatcher.prototype.dispatchFontLoading = function(font) {
     this.domHelper_.appendClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.LOADING));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.LOADING));
     this.dispatch_(
-        webfont.EventDispatcher.FONT + webfont.EventDispatcher.LOADING, fontFamily, fontDescription);
+        webfont.EventDispatcher.FONT + webfont.EventDispatcher.LOADING, font);
   };
 
   /**
    * Dispatch the font active event, remove the font loading class name, remove
    * the font inactive class name, and append the font active class name.
-   * @param {string} fontFamily
-   * @param {string} fontDescription
+   * @param {webfont.Font} font
    */
-  EventDispatcher.prototype.dispatchFontActive = function(fontFamily, fontDescription) {
+  EventDispatcher.prototype.dispatchFontActive = function(font) {
     this.domHelper_.removeClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.LOADING));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.LOADING));
     this.domHelper_.removeClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.INACTIVE));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.INACTIVE));
     this.domHelper_.appendClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.ACTIVE));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.ACTIVE));
     this.dispatch_(
-        webfont.EventDispatcher.FONT + webfont.EventDispatcher.ACTIVE, fontFamily, fontDescription);
+        webfont.EventDispatcher.FONT + webfont.EventDispatcher.ACTIVE, font);
   };
 
   /**
    * Dispatch the font inactive event, remove the font loading class name, and
    * append the font inactive class name (unless the font active class name is
    * already present).
-   * @param {string} fontFamily
-   * @param {string} fontDescription
+   * @param {webfont.Font} font
    */
-  EventDispatcher.prototype.dispatchFontInactive = function(fontFamily, fontDescription) {
+  EventDispatcher.prototype.dispatchFontInactive = function(font) {
     this.domHelper_.removeClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.LOADING));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.LOADING));
     var hasFontActive = this.domHelper_.hasClassName(this.htmlElement_,
         this.cssClassName_.build(
-            this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.ACTIVE));
+            this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.ACTIVE));
     if (!hasFontActive) {
       this.domHelper_.appendClassName(this.htmlElement_,
           this.cssClassName_.build(
-              this.namespace_, fontFamily, fontDescription, webfont.EventDispatcher.INACTIVE));
+              this.namespace_, font.getName(), font.getVariation().toString(), webfont.EventDispatcher.INACTIVE));
     }
     this.dispatch_(
-        webfont.EventDispatcher.FONT + webfont.EventDispatcher.INACTIVE, fontFamily, fontDescription);
+        webfont.EventDispatcher.FONT + webfont.EventDispatcher.INACTIVE, font);
   };
 
   /**
@@ -160,12 +157,15 @@ goog.scope(function () {
 
   /**
    * @param {string} event
-   * @param {string=} opt_arg1
-   * @param {string=} opt_arg2
+   * @param {webfont.Font=} opt_font
    */
-  EventDispatcher.prototype.dispatch_ = function(event, opt_arg1, opt_arg2) {
+  EventDispatcher.prototype.dispatch_ = function(event, opt_font) {
     if (this.callbacks_[event]) {
-      this.callbacks_[event](opt_arg1, opt_arg2);
+      if (opt_font) {
+        this.callbacks_[event](opt_font.getName(), opt_font.getVariation());
+      } else {
+        this.callbacks_[event]();
+      }
     }
   };
 });