webfontloader 1.4.4 → 1.4.5

data/spec/{custom/customcss_spec.js → modules/custom_spec.js}

@@ -1,5 +1,5 @@
-describe('CustomCss', function () {
-  var CustomCss = webfont.CustomCss,
+describe('modules.Custom', function () {
+  var Custom = webfont.modules.Custom,
       FontFamily = webfont.FontFamily;
 
   describe('insert links correctly', function () {
@@ -14,7 +14,7 @@ describe('CustomCss', function () {
 
       load = jasmine.createSpy('load');
 
-      var defaultModule = new CustomCss(fakeDomHelper, {
+      var defaultModule = new Custom(fakeDomHelper, {
         families: ['Font1', 'Font2', 'Font3'],
         urls: ['http://moo', 'http://meuh']
       });

data/spec/{fontdeck/fontdeckscript_spec.js → modules/fontdeck_spec.js}

@@ -1,5 +1,5 @@
-describe('FontdeckScript', function () {
-  var FontdeckScript = webfont.FontdeckScript,
+describe('modules.Fontdeck', function () {
+  var Fontdeck = webfont.modules.Fontdeck,
       Font = webfont.Font;
 
   var configuration = {
@@ -55,8 +55,8 @@ describe('FontdeckScript', function () {
       insertInto: jasmine.createSpy('insertInto'),
       createScriptSrc: jasmine.createSpy('createScriptSrc'),
       getLoadWindow: jasmine.createSpy('getLoadWindow').andReturn(global),
-      getMainWindow: jasmine.createSpy('getMainWindow').andReturn({ location: { hostname: 'test-host-name' } }),
-      getProtocol: jasmine.createSpy('getProtocol').andReturn('https:')
+      getProtocol: jasmine.createSpy('getProtocol').andReturn('https:'),
+      getHostName: function () { return 'test-host-name';  }
     };
   });
 
@@ -65,7 +65,7 @@ describe('FontdeckScript', function () {
         support = null;
 
     beforeEach(function () {
-      fontdeck = new FontdeckScript(fakeDomHelper, configuration);
+      fontdeck = new Fontdeck(fakeDomHelper, configuration);
       support = jasmine.createSpy('support');
 
       fontdeck.supportUserAgent('user agent', support);
@@ -95,7 +95,7 @@ describe('FontdeckScript', function () {
         support = null;
 
     beforeEach(function () {
-      fontdeck = new FontdeckScript(fakeDomHelper, { id: null });
+      fontdeck = new Fontdeck(fakeDomHelper, { id: null });
       support = jasmine.createSpy('support');
 
       fontdeck.supportUserAgent('user agent', support);

data/spec/{google → modules/google}/fontapiparser_spec.js

@@ -1,5 +1,5 @@
-describe('FontApiParser', function () {
-  var FontApiParser = webfont.FontApiParser,
+describe('modules.google.FontApiParser', function () {
+  var FontApiParser = webfont.modules.google.FontApiParser,
       Font = webfont.Font;
 
   describe('parsed values are coherent', function () {

data/spec/{google → modules/google}/fontapiurlbuilder_spec.js

@@ -1,5 +1,5 @@
-describe('FontApiUrlBuilder', function () {
-  var FontApiUrlBuilder = webfont.FontApiUrlBuilder;
+describe('modules.google.FontApiUrlBuilder', function () {
+  var FontApiUrlBuilder = webfont.modules.google.FontApiUrlBuilder;
 
   it('should throw an exception if there are no font families', function () {
     var builder = new FontApiUrlBuilder('http://moo', 'http:');

data/spec/{google → modules/google}/googlefontapi_spec.js

@@ -1,5 +1,5 @@
-describe('GoogleFontApi', function () {
-  var GoogleFontApi = webfont.GoogleFontApi,
+describe('modules.google.GoogleFontApi', function () {
+  var GoogleFontApi = webfont.modules.google.GoogleFontApi,
       Font = webfont.Font,
       UserAgent = webfont.UserAgent,
       userAgent = null,

data/spec/{google → modules/google}/lastresortwebkitfontwatchrunner_spec.js

@@ -1,5 +1,5 @@
-describe('LastResortWebKitFontWatchRunner', function () {
-  var LastResortWebKitFontWatchRunner = webfont.LastResortWebKitFontWatchRunner,
+describe('modules.google.LastResortWebKitFontWatchRunner', function () {
+  var LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
       BrowserInfo = webfont.BrowserInfo,
       DomHelper = webfont.DomHelper,
       FontRuler = webfont.FontRuler,

data/spec/{monotype/monotypescript_spec.js → modules/monotype_spec.js}

@@ -1,5 +1,5 @@
-describe('MonotypeScript', function () {
-  var MonotypeScript = webfont.MonotypeScript,
+describe('modules.Monotype', function () {
+  var Monotype = webfont.modules.Monotype,
       Font = webfont.Font,
       BrowserInfo = webfont.BrowserInfo,
       UserAgent = webfont.UserAgent,
@@ -43,17 +43,18 @@ describe('MonotypeScript', function () {
       new BrowserInfo(true, false, false)
     );
 
-    monotype = new MonotypeScript(useragent, fakeDomHelper, configuration);
+    monotype = new Monotype(useragent, fakeDomHelper, configuration);
     monotype.supportUserAgent(useragent, support);
     monotype.load(load);
 
-    global[MonotypeScript.HOOK + configuration.projectId] = function () {
+    global[Monotype.HOOK + configuration.projectId] = function () {
       return [{fontfamily: 'aachen bold'}, {fontfamily: 'kid print regular'}];
     };
 
     script.onload();
   });
 
+
   it('should create a script element', function () {
     expect(support).toHaveBeenCalled();
     expect(fakeDomHelper.createElement).toHaveBeenCalledWith('script');

data/spec/{typekit/typekitscript_spec.js → modules/typekit_spec.js}

@@ -1,5 +1,5 @@
-describe('TypekitScript', function () {
-  var TypekitScript = webfont.TypekitScript,
+describe('modules.Typekit', function () {
+  var Typekit = webfont.modules.Typekit,
       Font = webfont.Font;
 
   var configuration = {
@@ -27,7 +27,7 @@ describe('TypekitScript', function () {
   });
 
   it('support load and life cycle', function () {
-    var typekit = new TypekitScript(fakeDomHelper, configuration);
+    var typekit = new Typekit(fakeDomHelper, configuration);
 
     typekit.supportUserAgent('useragent', support);
 
@@ -53,7 +53,7 @@ describe('TypekitScript', function () {
   });
 
   it('should load with variations', function () {
-    var typekit = new TypekitScript(fakeDomHelper, configuration);
+    var typekit = new Typekit(fakeDomHelper, configuration);
 
     typekit.supportUserAgent('useragent', support);
 
@@ -75,7 +75,7 @@ describe('TypekitScript', function () {
   });
 
   it('should load through the alternative API', function () {
-    var typekit = new TypekitScript(fakeDomHelper, { id: 'abc', api: '/test' });
+    var typekit = new Typekit(fakeDomHelper, { id: 'abc', api: '/test' });
 
     typekit.supportUserAgent('useragent', support);
     expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
@@ -83,7 +83,7 @@ describe('TypekitScript', function () {
   });
 
   it('should not load without a kit id', function () {
-    var typekit = new TypekitScript(fakeDomHelper, { id: null });
+    var typekit = new Typekit(fakeDomHelper, { id: null });
 
     typekit.supportUserAgent('useragent', support);
 

data/src/core/domhelper.js

@@ -82,8 +82,9 @@ goog.scope(function () {
    * @param {function()} callback The function to call.
    */
   DomHelper.prototype.whenBodyExists = function(callback) {
+    var that = this;
     var check = function() {
-      if (document.body) {
+      if (that.document_.body) {
         callback();
       } else {
         setTimeout(check, 0);
@@ -234,4 +235,64 @@ goog.scope(function () {
     }
     return protocol == 'https:' ? 'https:' : 'http:';
   };
+
+  /**
+   * Returns the secure status of the current document.
+   * @return {boolean} true if the current document is served securely.
+   */
+  DomHelper.prototype.isHttps = function() {
+    return this.getProtocol() === 'https:';
+  };
+
+  /**
+   * Returns the hostname of the current document.
+   * @return {string} hostname.
+   */
+  DomHelper.prototype.getHostName = function() {
+    return this.getLoadWindow().location.hostname || this.getMainWindow().location.hostname;
+  };
+
+  /**
+   * Creates a style element.
+   * @param {string} css Contents of the style element.
+   * @return {Element} a DOM element.
+   */
+  DomHelper.prototype.createStyle = function(css) {
+    var e = this.document_.createElement('style');
+
+    e.setAttribute('type', 'text/css');
+    if (e.styleSheet) { // IE
+      e.styleSheet.cssText = css;
+    } else {
+      e.appendChild(document.createTextNode(css));
+    }
+    return e;
+  };
+
+  /**
+   * Loads an external script file.
+   * @param {string} src URL of the script.
+   * @param {function()=} opt_callback callback when the script has loaded.
+   */
+  DomHelper.prototype.loadScript = function(src, opt_callback) {
+    var head = this.document_.getElementsByTagName('head')[0];
+
+    if (head) {
+      var script = this.document_.createElement('script');
+      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();
+          }
+          script.onload = script.onreadystatechange = null;
+          // Avoid a bizarre issue with unclosed <base> tag in IE6 - http://blog.dotsmart.net/2008/04/
+          if (script.parentNode.tagName == 'HEAD') head.removeChild(script);
+        }
+      };
+      head.appendChild(script);
+    }
+  };
 });

data/src/core/fontwatcher.js

@@ -39,7 +39,7 @@ goog.scope(function () {
    *                  string=)} fontWatchRunnerCtor The font watch runner constructor.
    * @param {boolean} last True if this is the last set of fonts to watch.
    */
-  FontWatcher.prototype.watch = function(fonts,
+  FontWatcher.prototype.watchFonts = function(fonts,
       fontTestStrings, fontWatchRunnerCtor, last) {
     var length = fonts.length;
 

data/src/core/webfont.js

@@ -73,7 +73,7 @@ goog.scope(function () {
           eventDispatcher.dispatchLoading();
         }
       }
-      fontWatcher.watch([], {}, fontWatchRunnerCtor, allModulesLoaded);
+      fontWatcher.watchFonts([], {}, fontWatchRunnerCtor, allModulesLoaded);
       return;
     }
 
@@ -106,7 +106,7 @@ goog.scope(function () {
     }
 
     setTimeout(function () {
-      fontWatcher.watch(fonts, opt_fontTestStrings || {}, fontWatchRunnerCtor, allModulesLoaded);
+      fontWatcher.watchFonts(fonts, opt_fontTestStrings || {}, fontWatchRunnerCtor, allModulesLoaded);
     }, 0);
   };
 

data/src/modules.yml

@@ -16,22 +16,22 @@ core:
   - core/initialize.js
 
 ascender:
-  - ascender/ascender_script.js
+  - modules/ascender.js
 
 google:
-  - google/lastresortwebkitfontwatchrunner.js
-  - google/fontapiurlbuilder.js
-  - google/fontapiparser.js
-  - google/googlefontapi.js
+  - modules/google/lastresortwebkitfontwatchrunner.js
+  - modules/google/fontapiurlbuilder.js
+  - modules/google/fontapiparser.js
+  - modules/google/googlefontapi.js
 
 fontdeck:
-  - fontdeck/fontdeck_script.js
+  - modules/fontdeck.js
 
 typekit:
-  - typekit/typekit_script.js
+  - modules/typekit.js
 
 monotype:
-  - monotype/monotype_script.js
+  - modules/monotype.js
 
 custom:
-  - custom/customcss.js
+  - modules/custom.js

data/src/{ascender/ascender_script.js → modules/ascender.js}

@@ -1,4 +1,4 @@
-goog.provide('webfont.AscenderScript');
+goog.provide('webfont.modules.Ascender');
 
 goog.require('webfont.Font');
 
@@ -14,14 +14,14 @@ goog.require('webfont.Font');
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.AscenderScript = function(domHelper, configuration) {
+webfont.modules.Ascender = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
 };
 
-webfont.AscenderScript.NAME = 'ascender';
+webfont.modules.Ascender.NAME = 'ascender';
 
-webfont.AscenderScript.VARIATIONS = {
+webfont.modules.Ascender.VARIATIONS = {
   'regular': 'n4',
   'bold': 'n7',
   'italic': 'i4',
@@ -33,14 +33,14 @@ webfont.AscenderScript.VARIATIONS = {
 };
 
 goog.scope(function () {
-  var AscenderScript = webfont.AscenderScript,
+  var Ascender = webfont.modules.Ascender,
       Font = webfont.Font;
 
-  AscenderScript.prototype.supportUserAgent = function(userAgent, support) {
+  Ascender.prototype.supportUserAgent = function(userAgent, support) {
     return support(userAgent.getBrowserInfo().hasWebFontSupport());
   };
 
-  AscenderScript.prototype.load = function(onReady) {
+  Ascender.prototype.load = function(onReady) {
     var key = this.configuration_['key'];
     var protocol = this.domHelper_.getProtocol();
     var url = protocol + '//webfonts.fontslive.com/css/' + key + '.css';
@@ -53,7 +53,7 @@ goog.scope(function () {
    * @param {Array.<string>} providedFamilies
    * @return {Array.<webfont.Font>}
    */
-  AscenderScript.prototype.parseFamiliesAndVariations = function (providedFamilies) {
+  Ascender.prototype.parseFamiliesAndVariations = function (providedFamilies) {
     var fonts = [];
 
     for (var i = 0, len = providedFamilies.length; i < len; i++) {
@@ -66,7 +66,7 @@ goog.scope(function () {
    * @param {string} providedFamily
    * @return {Array.<webfont.Font>}
    */
-  AscenderScript.prototype.parseFamilyAndVariations = function (providedFamily){
+  Ascender.prototype.parseFamilyAndVariations = function (providedFamily){
     var parts = providedFamily.split(':'),
         familyName = parts[0];
 
@@ -86,7 +86,7 @@ goog.scope(function () {
    * @param {string} source
    * @return {Array.<string>}
    */
-  AscenderScript.prototype.parseVariations = function (source) {
+  Ascender.prototype.parseVariations = function (source) {
     var providedVariations = source.split(','),
         variations = [];
 
@@ -94,7 +94,7 @@ goog.scope(function () {
       var pv = providedVariations[i];
 
       if (pv) {
-        var v = AscenderScript.VARIATIONS[pv];
+        var v = Ascender.VARIATIONS[pv];
         variations.push(v ? v : pv);
       }
     }
@@ -102,6 +102,6 @@ goog.scope(function () {
   };
 });
 
-globalNamespaceObject.addModule(webfont.AscenderScript.NAME, function(configuration, domHelper) {
-  return new webfont.AscenderScript(domHelper, configuration);
+globalNamespaceObject.addModule(webfont.modules.Ascender.NAME, function(configuration, domHelper) {
+  return new webfont.modules.Ascender(domHelper, configuration);
 });

data/src/{custom/customcss.js → modules/custom.js}

@@ -1,4 +1,4 @@
-goog.provide('webfont.CustomCss');
+goog.provide('webfont.modules.Custom');
 
 goog.require('webfont.Font');
 
@@ -13,18 +13,18 @@ goog.require('webfont.Font');
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.CustomCss = function(domHelper, configuration) {
+webfont.modules.Custom = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
 };
 
-webfont.CustomCss.NAME = 'custom';
+webfont.modules.Custom.NAME = 'custom';
 
 goog.scope(function () {
-  var CustomCss = webfont.CustomCss,
+  var Custom = webfont.modules.Custom,
       Font = webfont.Font;
 
-  CustomCss.prototype.load = function(onReady) {
+  Custom.prototype.load = function(onReady) {
     var i, len;
     var urls = this.configuration_['urls'] || [];
     var familiesConfiguration = this.configuration_['families'] || [];
@@ -54,11 +54,11 @@ goog.scope(function () {
     onReady(fonts);
   };
 
-  CustomCss.prototype.supportUserAgent = function(userAgent, support) {
+  Custom.prototype.supportUserAgent = function(userAgent, support) {
     return support(userAgent.getBrowserInfo().hasWebFontSupport());
   };
 });
 
-globalNamespaceObject.addModule(webfont.CustomCss.NAME, function(configuration, domHelper) {
-  return new webfont.CustomCss(domHelper, configuration);
+globalNamespaceObject.addModule(webfont.modules.Custom.NAME, function(configuration, domHelper) {
+  return new webfont.modules.Custom(domHelper, configuration);
 });

data/src/{fontdeck/fontdeck_script.js → modules/fontdeck.js}

@@ -1,4 +1,4 @@
-goog.provide('webfont.FontdeckScript');
+goog.provide('webfont.modules.Fontdeck');
 
 goog.require('webfont.Font');
 
@@ -6,44 +6,43 @@ goog.require('webfont.Font');
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.FontdeckScript = function(domHelper, configuration) {
+webfont.modules.Fontdeck = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
   this.fonts_ = [];
 };
 
-webfont.FontdeckScript.NAME = 'fontdeck';
-webfont.FontdeckScript.HOOK = '__webfontfontdeckmodule__';
-webfont.FontdeckScript.API = '//f.fontdeck.com/s/css/js/';
+webfont.modules.Fontdeck.NAME = 'fontdeck';
+webfont.modules.Fontdeck.HOOK = '__webfontfontdeckmodule__';
+webfont.modules.Fontdeck.API = '//f.fontdeck.com/s/css/js/';
 
 goog.scope(function () {
-  var FontdeckScript = webfont.FontdeckScript,
+  var Fontdeck = webfont.modules.Fontdeck,
       Font = webfont.Font,
       FontVariationDescription = webfont.FontVariationDescription;
 
-  FontdeckScript.prototype.getScriptSrc = function(projectId) {
+  Fontdeck.prototype.getScriptSrc = function(projectId) {
     var protocol = this.domHelper_.getProtocol();
     // For empty iframes, fall back to main window's hostname.
-    var hostname = this.domHelper_.getLoadWindow().location.hostname ||
-        this.domHelper_.getMainWindow().location.hostname;
-    var api = this.configuration_['api'] || webfont.FontdeckScript.API;
+    var hostname = this.domHelper_.getHostName();
+    var api = this.configuration_['api'] || webfont.modules.Fontdeck.API;
     return protocol + api + hostname + '/' + projectId + '.js';
   };
 
-  FontdeckScript.prototype.supportUserAgent = function(userAgent, support) {
+  Fontdeck.prototype.supportUserAgent = function(userAgent, support) {
     var projectId = this.configuration_['id'];
     var loadWindow = this.domHelper_.getLoadWindow();
     var self = this;
 
     if (projectId) {
       // Provide data to Fontdeck for processing.
-      if (!loadWindow[webfont.FontdeckScript.HOOK]) {
-        loadWindow[webfont.FontdeckScript.HOOK] = {};
+      if (!loadWindow[webfont.modules.Fontdeck.HOOK]) {
+        loadWindow[webfont.modules.Fontdeck.HOOK] = {};
       }
 
       // Fontdeck will call this function to indicate support status
       // and what fonts are provided.
-      loadWindow[webfont.FontdeckScript.HOOK][projectId] = function(fontdeckSupports, data) {
+      loadWindow[webfont.modules.Fontdeck.HOOK][projectId] = function(fontdeckSupports, data) {
         for (var i = 0, j = data['fonts'].length; i<j; ++i) {
           var font = data['fonts'][i];
           self.fonts_.push(new Font(font['name'], Font.parseCssVariation('font-weight:' + font['weight'] + ';font-style:' + font['style'])));
@@ -60,11 +59,11 @@ goog.scope(function () {
     }
   };
 
-  FontdeckScript.prototype.load = function(onReady) {
+  Fontdeck.prototype.load = function(onReady) {
     onReady(this.fonts_);
   };
 });
 
-globalNamespaceObject.addModule(webfont.FontdeckScript.NAME, function(configuration, domHelper) {
-  return new webfont.FontdeckScript(domHelper, configuration);
+globalNamespaceObject.addModule(webfont.modules.Fontdeck.NAME, function(configuration, domHelper) {
+  return new webfont.modules.Fontdeck(domHelper, configuration);
 });