webfontloader 1.5.21 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38658e34f875143f4c7da55b806b3734211ec243
-  data.tar.gz: 18161fe41190393aabe0b5a1c66b1da7e2b327c2
+  metadata.gz: 45a47daf28ee4cd29e8e044c4ff0c296d03f7f4d
+  data.tar.gz: 632bcb1c5d914ddf66aeb679b3d705e34e144945
 SHA512:
-  metadata.gz: 51d3ec5bdc64984eb0bdfc0601dbe01e49a3a2081877109e2facaf304146e00ca63670ea942b872cb88293a2a937056c16563a3ee0049e18f6b63af272ec20db
-  data.tar.gz: 8f028fafa7ccf2bec73e6ec81718b2c1a496905635777043a19b3e6bc6dce49fab8eeaaf611e2214d555098054f8a92254292a326563d96d7575616de1e2761c
+  metadata.gz: f105249ee823a73c6c57573a81938bdcac178e22be04960259cbfc5bae535c186d9160ea76681487971bf8796e397eb293e52ae40baabc62aa19f15e324d49b7
+  data.tar.gz: e4f343569f5fcb6e98c0f6e72896264c6a29cf8ec28701b3c402897f71b647f33ce2ca4007ad1c8bffa2a9d3c07ec93d9420f1b52f2f2b52ae06bcb4cda9bbfe

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.6.0 (May 28, 2015)
+* Remove user agent string sniffing. From now on the Web Font Loader will always try to load fonts.
+
 v1.5.21 (May 26, 2015)
 * No changes.
 

data/lib/webfontloader.rb

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

data/spec/core/fontwatcher_spec.js

@@ -2,8 +2,6 @@ describe('FontWatcher', function () {
   var FontWatcher = webfont.FontWatcher,
       FontWatchRunner = webfont.FontWatchRunner,
       Font = webfont.Font,
-      UserAgent = webfont.UserAgent,
-      BrowserInfo = webfont.BrowserInfo,
       DomHelper = webfont.DomHelper,
       Version = webfont.Version,
       domHelper = new DomHelper(window),
@@ -14,20 +12,9 @@ describe('FontWatcher', function () {
       font2 = null,
       font3 = null,
       font4 = null,
-      userAgent = null,
       activeFonts = [];
 
   beforeEach(function () {
-    userAgent = new UserAgent(
-      'Firefox',
-      new Version(3, 6),
-      'Gecko',
-      new Version(1, 9, 3),
-      'Macintosh',
-      new Version(10, 6),
-      undefined,
-      new BrowserInfo(true, false, false, false)
-    );
     font1 = new Font('font1');
     font2 = new Font('font2');
     font3 = new Font('font3');
@@ -66,7 +53,7 @@ describe('FontWatcher', function () {
   describe('watch zero fonts', function () {
     it('should call inactive when there are no fonts to load', function () {
       activeFonts = [];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([], {}, null, true);
       expect(eventDispatcher.dispatchInactive).toHaveBeenCalled();
@@ -74,7 +61,7 @@ describe('FontWatcher', function () {
 
     it('should not call inactive when there are no fonts to load, but this is not the last set', function () {
       activeFonts = [];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([], {}, null, false);
       expect(eventDispatcher.dispatchInactive).not.toHaveBeenCalled();
@@ -84,7 +71,7 @@ describe('FontWatcher', function () {
   describe('watch one font not last', function () {
     it('should not call font inactive, inactive or active', function () {
       activeFonts = [font1];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1], {}, null, false);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
@@ -96,7 +83,7 @@ describe('FontWatcher', function () {
   describe('watch one font active', function () {
     it('should call font active and active', function () {
       activeFonts = [font1];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
@@ -110,7 +97,7 @@ describe('FontWatcher', function () {
   describe('watch one font inactive', function () {
     it('should call inactive', function () {
       activeFonts = [];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
@@ -124,7 +111,7 @@ describe('FontWatcher', function () {
   describe('watch multiple fonts active', function () {
     it('should call font active and active', function () {
       activeFonts = [font1, font2, font3];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
@@ -138,7 +125,7 @@ describe('FontWatcher', function () {
   describe('watch multiple fonts inactive', function () {
     it('should call inactive', function () {
       activeFonts = [];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
@@ -152,7 +139,7 @@ describe('FontWatcher', function () {
   describe('watch multiple fonts mixed', function () {
     it('should call the correct callbacks', function () {
       activeFonts = [font1, font3];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(3);
@@ -181,7 +168,7 @@ describe('FontWatcher', function () {
           font9 = new Font('font8', 'n7');
 
       activeFonts = [font5, font6];
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(5);
@@ -209,7 +196,7 @@ describe('FontWatcher', function () {
     it('should use the correct tests strings', function () {
       activeFonts = [font1, font2];
 
-      var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
+      var fontWatcher = new FontWatcher(domHelper, eventDispatcher);
 
       fontWatcher.watchFonts([font1, font2, font3, font4], {
         'font1': 'testString1',
@@ -227,7 +214,7 @@ describe('FontWatcher', function () {
   });
 
   it('should pass on the timeout to FontWatchRunner', function () {
-    var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher, 4000);
+    var fontWatcher = new FontWatcher(domHelper, eventDispatcher, 4000);
 
     fontWatcher.watchFonts([font1], {}, null, true);
 

data/spec/core/fontwatchrunner_spec.js

@@ -2,29 +2,23 @@ describe('FontWatchRunner', function () {
   var FontWatchRunner = webfont.FontWatchRunner,
       Font = webfont.Font,
       BrowserInfo = webfont.BrowserInfo,
-      UserAgentParser = webfont.UserAgentParser,
       DomHelper = webfont.DomHelper,
       FontRuler = webfont.FontRuler;
 
   var domHelper = null,
       activeCallback = null,
       inactiveCallback = null,
-      userAgent = null,
       nullFont = null,
       sourceSansA = null,
       sourceSansB = null,
       elena = null;
 
   beforeEach(function () {
-    var userAgentParser = new UserAgentParser(window.navigator.userAgent, window.document);
-
     domHelper = new DomHelper(window);
 
     activeCallback = jasmine.createSpy('activeCallback');
     inactiveCallback = jasmine.createSpy('inactiveCallback');
 
-    userAgent = userAgentParser.parse();
-
     nullFont = new Font('__webfontloader_test__');
     sourceSansA = new Font('SourceSansA');
     sourceSansB = new Font('SourceSansB');
@@ -33,7 +27,7 @@ describe('FontWatchRunner', function () {
 
   it('should fail to load a null font', function () {
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, nullFont, userAgent.getBrowserInfo(), 500, {});
+        domHelper, nullFont, 500, {});
 
     runs(function () {
       fontWatchRunner.start();
@@ -50,7 +44,7 @@ describe('FontWatchRunner', function () {
 
   it('should load font succesfully', function () {
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, sourceSansA, userAgent.getBrowserInfo(), 5000),
+        domHelper, sourceSansA,  5000),
         ruler = new FontRuler(domHelper, 'abcdef'),
         monospace = new Font('monospace'),
         sourceSansAFallback = new Font("'SourceSansA', monospace"),
@@ -92,7 +86,7 @@ describe('FontWatchRunner', function () {
 
   it('should attempt to load a non-existing font', function () {
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, elena, userAgent.getBrowserInfo(), 500, {});
+        domHelper, elena, 500, {});
 
     runs(function () {
       fontWatchRunner.start();
@@ -109,7 +103,7 @@ describe('FontWatchRunner', function () {
 
   it('should load even if @font-face is inserted after watching has started', function () {
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, sourceSansB, userAgent.getBrowserInfo(), 5000),
+        domHelper, sourceSansB, 5000),
         ruler = new FontRuler(domHelper, 'abcdef'),
         monospace = new Font('monospace'),
         sourceSansBFallback = new Font("'SourceSansB', monospace"),

data/spec/core/nativefontwatchrunner_spec.js

@@ -1,14 +1,12 @@
 describe('NativeFontWatchRunner', function () {
   var NativeFontWatchRunner = webfont.NativeFontWatchRunner,
       Font = webfont.Font,
-      UserAgentParser = webfont.UserAgentParser,
       DomHelper = webfont.DomHelper,
       FontRuler = webfont.FontRuler;
 
   var domHelper = null,
       activeCallback = null,
       inactiveCallback = null,
-      userAgent = null,
       nullFont = null,
       sourceSansC = null,
       elena = null;
@@ -19,13 +17,9 @@ describe('NativeFontWatchRunner', function () {
     activeCallback = jasmine.createSpy('activeCallback');
     inactiveCallback = jasmine.createSpy('inactiveCallback');
 
-    var userAgentParser = new UserAgentParser(window.navigator.userAgent, window.document);
-
     nullFont = new Font('__webfontloader_test_3__');
     sourceSansC = new Font('SourceSansC');
     elena = new Font('Elena');
-
-    userAgent = userAgentParser.parse();
   });
 
   if (window['FontFace']) {

data/spec/core/webfont_spec.js

@@ -1,103 +1,21 @@
 describe('WebFont', function () {
   var WebFont = webfont.WebFont,
       Font = webfont.Font;
-      UserAgent = webfont.UserAgent,
       FontWatchRunner = webfont.FontWatchRunner,
       NativeFontWatchRunner = webfont.NativeFontWatchRunner,
-      BrowserInfo = webfont.BrowserInfo,
       Version = webfont.Version,
       Font = webfont.Font,
       FontModuleLoader = webfont.FontModuleLoader,
-      fontModuleLoader = null,
-      userAgent = null;
+      fontModuleLoader = null;
 
   beforeEach(function () {
-    userAgent = new UserAgent(
-      'Firefox',
-      new Version(3, 6),
-      '3.6',
-      'Gecko',
-      new Version(1, 9, 2),
-      '1.9.2',
-      'Macintosh',
-      new Version(10, 6),
-      '10.6',
-      undefined,
-      new BrowserInfo(true, false, false, false)
-    );
     fontModuleLoader = new FontModuleLoader();
   });
 
-  describe('font load', function () {
-    var font = null,
-        testModule = null;
-
-    beforeEach(function () {
-      font = new WebFont(window);
-      font.addModule('test', function (conf, domHelper) {
-        testModule = new function () {
-          this.conf = conf;
-          this.domHelper = domHelper;
-          this.loadCalled = true;
-          this.supportUserAgentCalled = false;
-        };
-
-        testModule.load = function (onReady) {
-          this.loadCalled = true;
-          onReady([]);
-        };
-
-        testModule.supportUserAgent = function (ua, support) {
-          this.supportUserAgentCalled = true;
-          support(true);
-        };
-
-        return testModule;
-      });
-    });
-
-    it('should not start loading', function () {
-      expect(font.moduleFailedLoading_).toEqual(0);
-      expect(font.moduleLoading_).toEqual(0);
-    });
-
-    it('should fail to load a module', function () {
-      var loading = jasmine.createSpy('loading');
-
-      font.load({
-        test: {
-          somedata: 'in french a cow says meuh'
-        },
-        loading: loading
-      });
-
-      expect(font.moduleFailedLoading_).toEqual(1);
-      expect(font.moduleLoading_).toEqual(0);
-      expect(testModule).not.toBeNull();
-
-      expect(testModule.conf).not.toBeUndefined();
-      expect(testModule.conf).not.toBeNull();
-
-      expect(testModule.domHelper).not.toBeNull();
-      expect(testModule.domHelper).not.toBeUndefined();
-
-      expect(testModule.domHelper.getMainWindow()).toEqual(window);
-      expect(testModule.domHelper.getLoadWindow()).toEqual(window);
-
-      expect(testModule.conf.somedata).toEqual('in french a cow says meuh');
-      expect(testModule.loadCalled).toBe(true);
-      expect(testModule.supportUserAgentCalled).toBe(true);
-      expect(loading).toHaveBeenCalled();
-    });
-  });
-
   describe('font load with context', function () {
     var font = null,
         testModule = null,
         fakeMainWindow = {
-          navigator: {
-            userAgent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; en-US) AppleWebKit/533.2 (KHTML, like Gecko) Chrome/5.0.342.9 Safari/533.2'
-          },
           document: {}
         };
 
@@ -107,9 +25,8 @@ describe('WebFont', function () {
         testModule = new function () {
           this.domHelper = domHelper;
         };
-        testModule.load = function () {};
-        testModule.supportUserAgent = function (ua, support) {
-          support(true);
+        testModule.load = function (onReady) {
+          onReady([]);
         };
 
         return testModule;
@@ -146,7 +63,6 @@ describe('WebFont', function () {
       webfont.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;
-          this.fonts = [];
         };
 
         spyOn(FontWatchRunner.prototype, 'start').andCallFake(function () {
@@ -165,16 +81,12 @@ describe('WebFont', function () {
           }
         });
 
-        testModule.supportUserAgent = function (userAgent, support) {
+        testModule.load = function (onReady) {
           if (conf.id) {
-            // The monotype module only initializes font
-            // and description if there is a kit id.
-            this.fonts = [font];
+            onReady([font]);
+          } else {
+            onReady([]);
           }
-          support(true);
-        };
-        testModule.load = function (onReady) {
-          onReady(this.fonts);
         };
 
         return testModule;
@@ -221,7 +133,6 @@ describe('WebFont', function () {
 
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {};
-        testModule.supportUserAgent = function (ua, support) { support(true); };
         testModule.load = function (onReady) {
           onReady([new Font('Elena')], { 'Elena': '1234567' });
         };
@@ -243,40 +154,6 @@ describe('WebFont', function () {
     });
   });
 
-  describe('font inactive', function () {
-    var font = null,
-        testModule = null;
-
-    beforeEach(function () {
-      font = new WebFont(window);
-      font.addModule('test', function (conf, domHelper) {
-        testModule = new function () {
-          this.conf = conf;
-          this.loadCalled = false;
-        };
-        testModule.supportUserAgent = function (ua, support) {
-          support(false);
-        };
-        testModule.load = function () {};
-        return testModule;
-      });
-    });
-
-    it('should load with the correct context', function () {
-      var inactive = jasmine.createSpy('inactive');
-
-      font.load({
-        test: {
-          somedata: 'in french a cow says meuh'
-        },
-        inactive: inactive
-      });
-
-      expect(inactive).toHaveBeenCalled();
-      expect(inactive.calls.length).toEqual(1);
-    });
-  });
-
   describe('module fails to load', function () {
     var font = null,
         testModule = null,
@@ -287,17 +164,12 @@ describe('WebFont', function () {
       inactive = jasmine.createSpy('inactive'),
       active = jasmine.createSpy('active');
 
-      font = new WebFont(window, fontModuleLoader, userAgent);
+      font = new WebFont(window, fontModuleLoader);
 
       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();
+          onReady([]);
         };
 
         return testModule;
@@ -336,17 +208,12 @@ describe('WebFont', function () {
       active = jasmine.createSpy('active');
       loading = jasmine.createSpy('loading');
 
-      font = new WebFont(window, fontModuleLoader, userAgent);
+      font = new WebFont(window, fontModuleLoader);
 
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {};
-        testModule.supportUserAgent = function (ua, support) {
-          window.setTimeout(function () {
-            support(true);
-          }, 100);
-        };
         testModule.load = function (onReady) {
-          onReady([]);
+          onReady([new Font('Elena')]);
         };
 
         return testModule;