webfontloader 1.4.4 → 1.4.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.4.5 (May 23, 2013)
+* Move modules into their own namespace
+* Add new methods into DomHelper and add specs for all DomHelper methods
+* Rename watch method so as not to conflict with Firefox Object.prototype.watch
+
 v1.4.4 (May 22, 2013)
 * Change the UserAgent API so that it is backwards compatible with older Typekit kits.
 

data/lib/webfontloader.rb

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

data/spec/core/domhelper_spec.js

@@ -1,5 +1,6 @@
 describe('DomHelper', function () {
-  var domHelper = new webfont.DomHelper(window);
+  var DomHelper = webfont.DomHelper,
+      domHelper = new DomHelper(window);
 
   describe('#createElement', function () {
     it('should create an element', function () {
@@ -155,4 +156,248 @@ describe('DomHelper', function () {
       expect(div.style.top).toEqual('1px');
     });
   });
+
+  describe('#createStyle', function () {
+    var style = null;
+
+    beforeEach(function () {
+      style = domHelper.createStyle('font-size:300px;');
+    });
+
+    it('should create a style element', function () {
+      expect(style).not.toBeNull();
+      expect(style.nodeName).toEqual('STYLE');
+    });
+
+    it('should set the css content correctly', function () {
+      if (style.styleSheet) {
+        expect(style.styleSheet.cssText).toEqual('font-size:300px;');
+      } else {
+        expect(style.textContent).toEqual('font-size:300px;');
+      }
+    });
+  });
+
+  describe('#loadScript', function () {
+    it('should load the script', function () {
+      runs(function () {
+        domHelper.loadScript('core/external_script.js');
+      });
+
+      waitsFor(function () {
+        return window.EXTERNAL_SCRIPT_LOADED;
+      }, 'script was never inserted', 1000);
+
+      runs(function () {
+        expect(window.EXTERNAL_SCRIPT_LOADED).toBe(true);
+      });
+    });
+
+    it('should call the callback', function () {
+      var called = false;
+
+      runs(function () {
+        domHelper.loadScript('core/external_script.js', function () {
+          called = true;
+        });
+      });
+
+      waitsFor(function () {
+        return called;
+      }, 'callback was never called', 1000);
+
+      runs(function () {
+        expect(called).toBe(true);
+      });
+    });
+  });
+
+  describe('#getProtocol', function () {
+    it('should return http', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'http:'
+        }
+      });
+
+      expect(domHelper.getProtocol()).toEqual('http:');
+    });
+
+    it('should return https', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'https:'
+        }
+      });
+
+      expect(domHelper.getProtocol()).toEqual('https:');
+    });
+
+    it('should return the protocol from an iframe', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'https:'
+        }
+      }, {
+        location: {
+          protocol: 'http:'
+        }
+      });
+
+      expect(domHelper.getProtocol()).toEqual('http:');
+    });
+
+    it('should return the protocol from the main window if the iframe has no protocol', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'http:'
+        }
+      }, {
+        location: {
+          protocol: 'about:'
+        }
+      });
+
+      expect(domHelper.getProtocol()).toEqual('http:');
+    });
+  });
+
+  describe('#isHttps', function () {
+    it('should return true if the protocol is https', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'https:'
+        }
+      });
+
+      expect(domHelper.isHttps()).toBe(true);
+    });
+
+    it('should return false if the protocol is not https', function () {
+      var domHelper = new DomHelper({
+        location: {
+          protocol: 'http:'
+        }
+      });
+
+      expect(domHelper.isHttps()).toBe(false);
+    });
+  });
+
+  describe('#getHostname', function () {
+    it('should return the hostname', function () {
+      var domHelper = new DomHelper({
+        location: {
+          hostname: 'example.com'
+        }
+      });
+
+      expect(domHelper.getHostName()).toEqual('example.com');
+    });
+
+    it('should return the hostname from the iframe if present', function () {
+      var domHelper = new DomHelper({
+        location: {
+          hostname: 'example.com'
+        }
+      }, {
+        location: {
+          hostname: 'example.org'
+        }
+      });
+
+      expect(domHelper.getHostName()).toEqual('example.org');
+    });
+  });
+
+  describe('#insertInto', function () {
+    it('should insert an element', function () {
+      var a = domHelper.createElement('div');
+
+      var result = domHelper.insertInto('body', a);
+
+      expect(result).toBe(true);
+      expect(a.parentNode.nodeName).toEqual('BODY');
+    });
+  });
+
+  describe('#whenBodyExists', function () {
+    var domHelper = null,
+        callback = null;
+
+    beforeEach(function () {
+      domHelper = new DomHelper({
+        document: {}
+      });
+
+      callback = jasmine.createSpy('callback');
+    });
+
+    it('should wait until the body exists before calling the callback', function () {
+      runs(function () {
+        domHelper.whenBodyExists(callback);
+      });
+
+      waits(200);
+
+      runs(function () {
+        domHelper.document_.body = true;
+      });
+
+      waitsFor(function () {
+        return callback.wasCalled;
+      }, 'callback was never called', 100);
+
+      runs(function () {
+        expect(callback).toHaveBeenCalled();
+      });
+    });
+
+    it('should not call the callback if the body is not available', function () {
+      runs(function () {
+        domHelper.whenBodyExists(callback);
+      });
+
+      waits(100);
+
+      runs(function () {
+        expect(callback).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('#removeElement', function () {
+    it('should remove an element', function () {
+      var a = domHelper.createElement('div'),
+          b = domHelper.createElement('div');
+
+      a.appendChild(b);
+
+      var result = domHelper.removeElement(b);
+      expect(result).toBe(true);
+      expect(b.parentNode).toEqual(null);
+    });
+
+    it('should return false when failing to remove an element', function () {
+      var a = domHelper.createElement('div');
+
+      var result = domHelper.removeElement(a);
+
+      expect(result).toBe(false);
+    });
+  });
+
+  describe('#getMainWindow', function () {
+    it('should return the main window', function () {
+      var domHelper = new DomHelper(1, 2);
+      expect(domHelper.getMainWindow()).toEqual(1);
+    });
+  });
+
+  describe('#getLoadWindow', function () {
+    it('should return the load window', function () {
+      var domHelper = new DomHelper(1, 2);
+      expect(domHelper.getLoadWindow()).toEqual(2);
+    });
+  });
 });

data/spec/core/external_script.js

@@ -0,0 +1 @@
+window.EXTERNAL_SCRIPT_LOADED = true;

data/spec/core/fontwatcher_spec.js

@@ -65,7 +65,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchInactive).toHaveBeenCalled();
     });
 
@@ -73,7 +73,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([], {}, FakeFontWatchRunner, false);
+      fontWatcher.watchFonts([], {}, FakeFontWatchRunner, false);
       expect(eventDispatcher.dispatchInactive).not.toHaveBeenCalled();
     });
   });
@@ -83,7 +83,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1], {}, FakeFontWatchRunner, false);
+      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, false);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchInactive).not.toHaveBeenCalled();
@@ -95,7 +95,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
@@ -109,7 +109,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchFontInactive).toHaveBeenCalledWith(font1);
@@ -123,7 +123,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1, font2, font3];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
@@ -137,7 +137,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchFontInactive).toHaveBeenCalledWith(font1);
@@ -151,7 +151,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1, font3];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(3);
       expect(eventDispatcher.dispatchFontLoading.calls[0].args[0]).toEqual(font1);
       expect(eventDispatcher.dispatchFontLoading.calls[1].args[0]).toEqual(font2);
@@ -180,7 +180,7 @@ describe('FontWatcher', function () {
       activeFonts = [font5, font6];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font5, font6, font7, font8, font9], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, FakeFontWatchRunner, true);
 
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(5);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font5);
@@ -209,7 +209,7 @@ describe('FontWatcher', function () {
 
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watch([font1, font2, font3, font4], {
+      fontWatcher.watchFonts([font1, font2, font3, font4], {
         'font1': 'testString1',
         'font2': null,
         'font3': 'testString2',
@@ -225,7 +225,7 @@ describe('FontWatcher', function () {
   it('should pass on the timeout to FontWatchRunner', function () {
     var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher, 4000);
 
-    fontWatcher.watch([font1], {}, FakeFontWatchRunner, true);
+    fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
 
     expect(timeout).toHaveBeenCalledWith(4000);
   });

data/spec/deps.js

@@ -1,5 +1,4 @@
 // This file was autogenerated by calcdeps.js
-goog.addDependency("../../src/ascender/ascender_script.js", ["webfont.AscenderScript"], ["webfont.Font"]);
 goog.addDependency("../../src/async_load.js", [], []);
 goog.addDependency("../../src/closure.js", [], []);
 goog.addDependency("../../src/core/browserinfo.js", ["webfont.BrowserInfo"], []);
@@ -17,11 +16,12 @@ 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/custom/customcss.js", ["webfont.CustomCss"], ["webfont.Font"]);
-goog.addDependency("../../src/fontdeck/fontdeck_script.js", ["webfont.FontdeckScript"], ["webfont.Font"]);
-goog.addDependency("../../src/google/fontapiparser.js", ["webfont.FontApiParser"], ["webfont.Font"]);
-goog.addDependency("../../src/google/fontapiurlbuilder.js", ["webfont.FontApiUrlBuilder"], []);
-goog.addDependency("../../src/google/googlefontapi.js", ["webfont.GoogleFontApi"], ["webfont.FontApiUrlBuilder","webfont.FontApiParser","webfont.FontWatchRunner","webfont.LastResortWebKitFontWatchRunner"]);
-goog.addDependency("../../src/google/lastresortwebkitfontwatchrunner.js", ["webfont.LastResortWebKitFontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
-goog.addDependency("../../src/monotype/monotype_script.js", ["webfont.MonotypeScript"], ["webfont.Font"]);
-goog.addDependency("../../src/typekit/typekit_script.js", ["webfont.TypekitScript"], ["webfont.Font"]);
+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.FontApiParser"], ["webfont.Font"]);
+goog.addDependency("../../src/modules/google/fontapiurlbuilder.js", ["webfont.modules.FontApiUrlBuilder"], []);
+goog.addDependency("../../src/modules/google/googlefontapi.js", ["webfont.modules.GoogleFontApi"], ["webfont.modules.FontApiUrlBuilder","webfont.modules.FontApiParser","webfont.FontWatchRunner","webfont.modules.LastResortWebKitFontWatchRunner"]);
+goog.addDependency("../../src/modules/google/lastresortwebkitfontwatchrunner.js", ["webfont.modules.LastResortWebKitFontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
+goog.addDependency("../../src/modules/monotype.js", ["webfont.modules.Monotype"], ["webfont.Font"]);
+goog.addDependency("../../src/modules/typekit.js", ["webfont.modules.Typekit"], ["webfont.Font"]);

data/spec/index.html

@@ -25,12 +25,12 @@
 
       // Require the modules because they don't have an explicit
       // dependency on core.
-      goog.require('webfont.TypekitScript');
-      goog.require('webfont.AscenderScript');
-      goog.require('webfont.FontdeckScript');
-      goog.require('webfont.MonotypeScript');
-      goog.require('webfont.CustomCss');
-      goog.require('webfont.GoogleFontApi');
+      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');
+      goog.require('webfont.modules.GoogleFontApi');
     </script>
 
     <script src="../spec/core/domhelper_spec.js"></script>
@@ -44,15 +44,15 @@
     <script src="../spec/core/fontwatcher_spec.js"></script>
     <script src="../spec/core/webfont_spec.js"></script>
     <script src="../spec/core/version_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>
-    <script src="../spec/google/lastresortwebkitfontwatchrunner_spec.js"></script>
-    <script src="../spec/custom/customcss_spec.js"></script>
-    <script src="../spec/ascender/ascenderscript_spec.js"></script>
-    <script src="../spec/fontdeck/fontdeckscript_spec.js"></script>
-    <script src="../spec/monotype/monotypescript_spec.js"></script>
-    <script src="../spec/typekit/typekitscript_spec.js"></script>
+    <script src="../spec/modules/google/fontapiparser_spec.js"></script>
+    <script src="../spec/modules/google/fontapiurlbuilder_spec.js"></script>
+    <script src="../spec/modules/google/googlefontapi_spec.js"></script>
+    <script src="../spec/modules/google/lastresortwebkitfontwatchrunner_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>
 
     <script>
       (function () {

data/spec/{ascender/ascenderscript_spec.js → modules/ascender_spec.js}

@@ -1,5 +1,5 @@
-describe('AscenderScript', function () {
-  var AscenderScript = webfont.AscenderScript,
+describe('modules.Ascender', function () {
+  var Ascender = webfont.modules.Ascender,
       Font = webfont.Font;
 
   var configuration = {
@@ -10,7 +10,7 @@ describe('AscenderScript', function () {
   describe('load family and variations', function () {
     var fakeDomHelper = null,
         fakeOnReady = null,
-        ascenderScript = null;
+        ascender = null;
 
     beforeEach(function () {
       fakeDomHelper = {
@@ -21,8 +21,8 @@ describe('AscenderScript', function () {
 
       fakeOnReady = jasmine.createSpy('onReady');
 
-      ascenderScript = new AscenderScript(fakeDomHelper, configuration);
-      ascenderScript.load(fakeOnReady);
+      ascender = new Ascender(fakeDomHelper, configuration);
+      ascender.load(fakeOnReady);
     });
 
     it('should create the link correctly', function () {
@@ -39,24 +39,24 @@ describe('AscenderScript', function () {
     });
 
     it('should parse variations correctly', function () {
-      expect(ascenderScript.parseVariations('regular')).toEqual(['n4']);
-      expect(ascenderScript.parseVariations('bold')).toEqual(['n7']);
-      expect(ascenderScript.parseVariations('italic')).toEqual(['i4']);
-      expect(ascenderScript.parseVariations('bolditalic')).toEqual(['i7']);
-      expect(ascenderScript.parseVariations('regular,')).toEqual(['n4']);
-      expect(ascenderScript.parseVariations('regular,bold')).toEqual(['n4', 'n7']);
-      expect(ascenderScript.parseVariations('regular,,bold')).toEqual(['n4', 'n7']);
-      expect(ascenderScript.parseVariations('n4,n7')).toEqual(['n4', 'n7']);
+      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(ascenderScript.parseFamilyAndVariations('Arial')).toEqual([new Font('Arial')]);
-      expect(ascenderScript.parseFamilyAndVariations('Arial:bold,regular')).toEqual([new Font('Arial', 'n7'), new Font('Arial', 'n4')]);
-      expect(ascenderScript.parseFamilyAndVariations('Arial:n4,n7')).toEqual([new Font('Arial', 'n4'), new Font('Arial', 'n7')]);
+      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(ascenderScript.parseFamiliesAndVariations(['Arial', 'Sans:n4,n7'])).toEqual([
+      expect(ascender.parseFamiliesAndVariations(['Arial', 'Sans:n4,n7'])).toEqual([
         new Font('Arial', 'n4'),
         new Font('Sans', 'n4'),
         new Font('Sans', 'n7')