webfontloader 1.4.12 → 1.5.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.5.0 (September 9, 2013)
+* Correctly categorize Internet Explorer 11 as an Internet Explorer version.
+* Add support for custom test strings in the custom module.
+* Various small bug fixes to the test suite so it runs on all browsers automatically.
+
 v1.4.12 (August 21, 2013)
 * Cleared up initialization code and made all modules optional and configurable at compile time
 

data/README.md

@@ -180,6 +180,19 @@ In this example, the `fonts.css` file might look something like this:
       src: ...;
     }
 
+The custom module also supports customizing the test strings that are used to determine whether or not a font has loaded. This can be used to load fonts with custom subsets or glyphs in the private use unicode area.
+
+    WebFontConfig = {
+      custom: {
+        families: ['My Font'],
+        testStrings: {
+          'My Font': '\uE003\uE005'
+        }
+      }
+    };
+
+Tests strings should be specified on a per font basis and contain at least one character. If not specified the default test string (`BESbswy`) is used.
+
 ### Fontdeck
 
 To use the [Fontdeck](http://fontdeck.com/) module, specify the ID of your website. You can find this ID on the website page within your account settings.

data/Rakefile

@@ -161,7 +161,7 @@ end
 #
 desc "BrowserStack tests"
 task :bstest do |t|
-  exec "browserstack-test -u $BROWSERSTACK_USERNAME -p $BROWSERSTACK_PASSWORD -k $BROWSERSTACK_KEY -b browsers.json http://localhost:9999/spec/index.html"
+  exec "browserstack-test -u $BROWSERSTACK_USERNAME -p $BROWSERSTACK_PASSWORD -k $BROWSERSTACK_KEY -b browsers.json -t 300 http://localhost:9999/spec/index.html"
 end
 
 desc "Test everything"

data/browsers.json

@@ -2,7 +2,7 @@
   {
     "os_version": "XP",
     "os": "Windows",
-    "browser_version": "11.1",
+    "browser_version": "12.16",
     "browser": "opera"
   },
   {
@@ -21,13 +21,15 @@
     "os_version": "XP",
     "os": "Windows",
     "browser_version": "6.0",
-    "browser": "ie"
+    "browser": "ie",
+    "timeout": "300"
   },
   {
     "os_version": "XP",
     "os": "Windows",
     "browser_version": "7.0",
-    "browser": "ie"
+    "browser": "ie",
+    "timeout": "300"
   },
   {
     "os_version": "XP",
@@ -69,54 +71,63 @@
     "os_version": "5.0",
     "device": "iPad 2 (5.0)",
     "os": "ios",
-    "browser": "Mobile Safari"
+    "browser": "Mobile Safari",
+    "timeout": "300"
   },
   {
     "os_version": "5.1",
     "device": "iPad 3rd",
     "os": "ios",
-    "browser": "Mobile Safari"
+    "browser": "Mobile Safari",
+    "timeout": "300"
   },
   {
     "os_version": "6.0",
     "device": "iPhone 5",
     "os": "ios",
-    "browser": "Mobile Safari"
+    "browser": "Mobile Safari",
+    "timeout": "300"
   },
   {
     "os_version": "4.3.2",
     "device": "iPad 2",
     "os": "ios",
-    "browser": "Mobile Safari"
+    "browser": "Mobile Safari",
+    "timeout": "300"
   },
   {
     "os_version": "2.3",
     "device": "Samsung Galaxy S II",
     "os": "android",
-    "browser": "Android Browser"
+    "browser": "Android Browser",
+    "timeout": "300"
   },
   {
     "os_version": "2.2",
     "device": "Samsung Galaxy S",
     "os": "android",
-    "browser": "Android Browser"
+    "browser": "Android Browser",
+    "timeout": "300"
   },
   {
     "os_version": "4.2",
     "device": "LG Nexus 4",
     "os": "android",
-    "browser": "Android Browser"
+    "browser": "Android Browser",
+    "timeout": "300"
   },
   {
     "os_version": "4.0",
     "device": "Samsung Galaxy Nexus",
     "os": "android",
-    "browser": "Android Browser"
+    "browser": "Android Browser",
+    "timeout": "300"
   },
   {
     "os_version": "4.1",
     "device": "Samsung Galaxy S III",
     "os": "android",
-    "browser": "Android Browser"
+    "browser": "Android Browser",
+    "timeout": "300"
   }
 ]

data/lib/webfontloader.rb

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

data/spec/core/domhelper_spec.js

@@ -136,7 +136,12 @@ describe('DomHelper', function () {
     var style = null;
 
     beforeEach(function () {
-      style = domHelper.createStyle('font-size:300px;');
+      style = domHelper.createStyle('blockquote{font-size:300px}');
+      domHelper.insertInto('head', style);
+    });
+
+    afterEach(function () {
+      domHelper.removeElement(style);
     });
 
     it('should create a style element', function () {
@@ -145,11 +150,8 @@ describe('DomHelper', function () {
     });
 
     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;');
-      }
+      var text = style.styleSheet ? style.styleSheet.cssText : style.textContent;
+      expect(text.replace(/[\s;]/g, '').toLowerCase()).toEqual('blockquote{font-size:300px}');
     });
   });
 
@@ -412,7 +414,7 @@ describe('DomHelper', function () {
 
       var result = domHelper.removeElement(b);
       expect(result).toBe(true);
-      expect(b.parentNode).toEqual(null);
+      expect(b.parentNode).not.toEqual(a);
     });
 
     it('should return false when failing to remove an element', function () {

data/spec/core/fontwatchrunner_spec.js

@@ -256,8 +256,6 @@ describe('FontWatchRunner', function () {
         nullFont = null,
         sourceSansA = null,
         sourceSansB = null,
-        sourceSansC = null,
-        sourceSansCBold = null,
         elena = null;
 
     beforeEach(function () {
@@ -266,8 +264,6 @@ describe('FontWatchRunner', function () {
       nullFont = new Font('__webfontloader_test__');
       sourceSansA = new Font('SourceSansA');
       sourceSansB = new Font('SourceSansB');
-      sourceSansC = new Font('SourceSansC');
-      sourceSansCBold = new Font('SourceSansC', 'n7');
       elena = new Font('Elena');
 
       userAgent = userAgentParser.parse();
@@ -292,7 +288,7 @@ describe('FontWatchRunner', function () {
 
     it('should load font succesfully', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, sourceSansA, userAgent.getBrowserInfo(), 500),
+          domHelper, sourceSansA, userAgent.getBrowserInfo(), 5000),
           ruler = new FontRuler(domHelper, 'abcdef'),
           monospace = new Font('monospace'),
           sourceSansAFallback = new Font("'SourceSansA', monospace"),
@@ -345,17 +341,13 @@ describe('FontWatchRunner', function () {
       });
 
       runs(function () {
-        if (userAgent.getBrowserInfo().hasWebKitFallbackBug()) {
-          expect(activeCallback).toHaveBeenCalledWith(elena);
-        } else {
-          expect(inactiveCallback).toHaveBeenCalledWith(elena);
-        }
+        expect(inactiveCallback).toHaveBeenCalledWith(elena);
       });
     });
 
     it('should load even if @font-face is inserted after watching has started', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, sourceSansB, userAgent.getBrowserInfo(), 500),
+          domHelper, sourceSansB, userAgent.getBrowserInfo(), 5000),
           ruler = new FontRuler(domHelper, 'abcdef'),
           monospace = new Font('monospace'),
           sourceSansBFallback = new Font("'SourceSansB', monospace"),
@@ -400,44 +392,5 @@ describe('FontWatchRunner', function () {
         expect(ruler.getWidth()).toEqual(activeWidth);
       });
     });
-
-    it('should load one weight after another', function () {
-       var fontWatchRunnerRegular = new FontWatchRunner(activeCallback, inactiveCallback,
-           domHelper, sourceSansC, userAgent.getBrowserInfo(), 500),
-           fontWatchRunnerBold = new FontWatchRunner(activeCallback, inactiveCallback,
-           domHelper, sourceSansCBold, userAgent.getBrowserInfo(), 500),
-           fontRulerA = new FontRuler(domHelper, 'abcdef'),
-           fontRulerB = new FontRuler(domHelper, 'abcdef');
-
-      runs(function () {
-        fontRulerA.insert();
-        fontRulerA.setFont(sourceSansC);
-        fontWatchRunnerRegular.start();
-      });
-
-      waitsFor(function () {
-        return activeCallback.wasCalled || inactiveCallback.wasCalled;
-      });
-
-      runs(function () {
-        expect(activeCallback).toHaveBeenCalledWith(sourceSansC);
-
-        activeCallback.reset();
-        inactiveCallback.reset();
-
-        fontRulerB.insert();
-        fontRulerB.setFont(sourceSansCBold);
-        fontWatchRunnerBold.start();
-      });
-
-      waitsFor(function () {
-        return activeCallback.wasCalled || inactiveCallback.wasCalled;
-      });
-
-      runs(function () {
-        expect(activeCallback).toHaveBeenCalledWith(sourceSansCBold);
-        expect(fontRulerA.getWidth()).not.toEqual(fontRulerB.getWidth());
-      });
-    });
   });
 });

data/spec/core/useragentparser_spec.js

@@ -558,9 +558,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows',
           parsedPlatformVersion: new Version(5, 1),
           platformVersion: '5.1',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(7, 0),
-          engineVersion: '7.0',
+          engine: 'Unknown',
+          parsedEngineVersion: new Version(),
+          engineVersion: 'Unknown',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
@@ -577,9 +577,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows',
           parsedPlatformVersion: new Version(5, 1),
           platformVersion: '5.1',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(7, 0, null, 'b'),
-          engineVersion: '7.0b',
+          engine: 'Unknown',
+          parsedEngineVersion: new Version(),
+          engineVersion: 'Unknown',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
@@ -598,9 +598,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows',
           parsedPlatformVersion: new Version(5, 1),
           platformVersion: '5.1',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(7, 0),
-          engineVersion: '7.0',
+          engine: 'Unknown',
+          parsedEngineVersion: new Version(),
+          engineVersion: 'Unknown',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
@@ -619,9 +619,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows Phone',
           parsedPlatformVersion: new Version(8, 0),
           platformVersion: '8.0',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(10, 0),
-          engineVersion: '10.0',
+          engine: 'Trident',
+          parsedEngineVersion: new Version(6, 0),
+          engineVersion: '6.0',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
@@ -640,9 +640,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows Phone',
           parsedPlatformVersion: new Version(7, 5),
           platformVersion: '7.5',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(9, 0),
-          engineVersion: '9.0',
+          engine: 'Trident',
+          parsedEngineVersion: new Version(5, 0),
+          engineVersion: '5.0',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
@@ -661,9 +661,9 @@ describe('UserAgentParser', function () {
           platform: 'Macintosh',
           parsedPlatformVersion: new Version(),
           platformVersion: 'Unknown',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(5, 23),
-          engineVersion: '5.23',
+          engine: 'Unknown',
+          parsedEngineVersion: new Version(),
+          engineVersion: 'Unknown',
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
@@ -673,7 +673,7 @@ describe('UserAgentParser', function () {
         });
       });
 
-      it('should detect Internet Explorer with Trident parsedVersion', function () {
+      it('should detect Internet Explorer with Trident version', function () {
         expect(parse('Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; WOW64; Trident/4.0; SLCC2; .NET CLR 2.0.50727; InfoPath.2)', { documentMode: 8 }))
         .toMatchUserAgent({
           name: 'MSIE',
@@ -682,9 +682,9 @@ describe('UserAgentParser', function () {
           platform: 'Windows',
           parsedPlatformVersion: new Version(6, 1),
           platformVersion: '6.1',
-          engine: 'MSIE',
-          parsedEngineVersion: new Version(8, 0),
-          engineVersion: '8.0',
+          engine: 'Trident',
+          parsedEngineVersion: new Version(4, 0),
+          engineVersion: '4.0',
           documentMode: 8,
           browserInfo: {
             hasWebFontSupport: true,
@@ -693,6 +693,27 @@ describe('UserAgentParser', function () {
           }
         });
       });
+
+      it('should detect Internet Explorer 11', function () {
+        expect(parse('Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko', { documentMode: 11 }))
+        .toMatchUserAgent({
+          name: 'MSIE',
+          parsedVersion: new Version(11, 0),
+          version: '11.0',
+          platform: 'Windows',
+          parsedPlatformVersion: new Version(6, 3),
+          platformVersion: '6.3',
+          engine: 'Trident',
+          parsedEngineVersion: new Version(7, 0),
+          engineVersion: '7.0',
+          documentMode: 11,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
     });
 
     describe('Builtin Browser', function () {

data/spec/index.html

@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
   <head>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Webfontloader tests</title>
     <link rel="stylesheet" href="../tools/jasmine/jasmine.css">
 
@@ -9,9 +10,6 @@
     <link rel="stylesheet" href="fixtures/fonts/nullfont2.css">
     <link rel="stylesheet" href="fixtures/fonts/nullfont3.css">
     <link rel="stylesheet" href="fixtures/fonts/sourcesansa.css">
-    <link rel="stylesheet" href="fixtures/fonts/sourcesansb.css">
-    <link rel="stylesheet" href="fixtures/fonts/sourcesansc.css">
-    <link rel="stylesheet" href="fixtures/fonts/sourcesanscbold.css">
  </head>
  <body>
     <script>
@@ -26,14 +24,6 @@
 
     <script>
       goog.require('webfont');
-
-      // Require the modules because they don't have an explicit
-      // dependency on core.
-      goog.require('webfont.modules.Typekit');
-      goog.require('webfont.modules.Fontdeck');
-      goog.require('webfont.modules.Monotype');
-      goog.require('webfont.modules.Custom');
-      goog.require('webfont.modules.google.GoogleFontApi');
     </script>
 
     <script src="../spec/core/domhelper_spec.js"></script>

data/spec/modules/custom_spec.js

@@ -15,7 +15,10 @@ describe('modules.Custom', function () {
 
       var defaultModule = new Custom(fakeDomHelper, {
         families: ['Font1', 'Font2', 'Font3'],
-        urls: ['http://moo', 'http://meuh']
+        urls: ['http://moo', 'http://meuh'],
+        testStrings: {
+          Font3: 'hello world'
+        }
       });
 
       defaultModule.load(load);
@@ -34,5 +37,10 @@ describe('modules.Custom', function () {
       expect(load.calls[0].args[0][1].getName()).toEqual('Font2');
       expect(load.calls[0].args[0][2].getName()).toEqual('Font3');
     });
+
+    it('should have set a custom test string', function () {
+      expect(load.callCount).toEqual(1);
+      expect(load.calls[0].args[1]).toEqual({ Font3: 'hello world' });
+    });
   });
 });

data/spec/modules/google/googlefontapi_spec.js

@@ -4,6 +4,9 @@ describe('modules.google.GoogleFontApi', function () {
       link = '',
       insert = '',
       fakeDomHelper =  {
+        whenBodyExists: function (callback) {
+          callback();
+        },
         loadStylesheet: function (cssLink) {
           link = cssLink;
         },

data/src/core/useragentparser.js

@@ -141,7 +141,7 @@ goog.scope(function () {
    * @private
    */
   UserAgentParser.prototype.isIe_ = function() {
-    return this.userAgent_.indexOf("MSIE") != -1;
+    return this.userAgent_.indexOf("MSIE") != -1 || this.userAgent_.indexOf("Trident/") != -1;
   };
 
   /**
@@ -151,21 +151,40 @@ goog.scope(function () {
     var platform = this.getPlatform_(),
         platformVersionString = this.getPlatformVersionString_(),
         platformVersion = Version.parse(platformVersionString),
-        browserVersionString = this.getMatchingGroup_(this.userAgent_, /MSIE ([\d\w\.]+)/, 1),
-        browserVersion = Version.parse(browserVersionString),
-        documentMode = this.getDocumentMode_(this.doc_),
-        supportWebFont = (platform == "Windows" && browserVersion.major >= 6) ||
+        browserVersionString = null,
+        browserVersion = null,
+        engine = null,
+        engineVersion = null,
+        engineVersionString = this.getMatchingGroup_(this.userAgent_, /Trident\/([\d\w\.]+)/, 1),
+        documentMode = this.getDocumentMode_(this.doc_);
+
+    if (this.userAgent_.indexOf("MSIE") != -1) {
+      browserVersionString = this.getMatchingGroup_(this.userAgent_, /MSIE ([\d\w\.]+)/, 1);
+    } else {
+      browserVersionString = this.getMatchingGroup_(this.userAgent_, /rv:([\d\w\.]+)/, 1);
+    }
+
+    browserVersion = Version.parse(browserVersionString);
+
+    if (engineVersionString != '') {
+      engine = 'Trident';
+      engineVersion = Version.parse(engineVersionString);
+    } else {
+      engine = UserAgentParser.UNKNOWN;
+      engineVersion = new Version();
+      engineVersionString = UserAgentParser.UNKNOWN;
+    }
+
+    var supportWebFont = (platform == "Windows" && browserVersion.major >= 6) ||
                          (platform == "Windows Phone" && platformVersion.major >= 8);
 
-    // For IE we give MSIE as the engine name and the version of IE
-    // instead of the specific Trident engine name and version
     return new UserAgent(
       "MSIE",
       browserVersion,
       browserVersionString,
-      "MSIE",
-      browserVersion,
-      browserVersionString,
+      engine,
+      engineVersion,
+      engineVersionString,
       platform,
       platformVersion,
       platformVersionString,

data/src/modules/custom.js

@@ -32,6 +32,7 @@ goog.scope(function () {
     var i, len;
     var urls = this.configuration_['urls'] || [];
     var familiesConfiguration = this.configuration_['families'] || [];
+    var fontTestStrings = this.configuration_['testStrings'] || {};
 
     for (i = 0, len = urls.length; i < len; i++) {
       this.domHelper_.loadStylesheet(urls[i]);
@@ -53,7 +54,7 @@ goog.scope(function () {
       }
     }
 
-    onReady(fonts);
+    onReady(fonts, fontTestStrings);
   };
 
   Custom.prototype.supportUserAgent = function(userAgent, support) {

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.12'
-  s.date              = '2013-08-21'
+  s.version           = '1.5.0'
+  s.date              = '2013-09-09'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -133,9 +133,6 @@ DESC
     spec/fixtures/fonts/sourcesans.woff
     spec/fixtures/fonts/sourcesansa.css
     spec/fixtures/fonts/sourcesansb.css
-    spec/fixtures/fonts/sourcesansc.css
-    spec/fixtures/fonts/sourcesanscbold.css
-    spec/fixtures/fonts/sourcesanscbold.otf
     spec/index.html
     spec/modules/custom_spec.js
     spec/modules/fontdeck_spec.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 12
-  version: 1.4.12
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-21 00:00:00 Z
+date: 2013-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -161,9 +161,6 @@ files:
 - spec/fixtures/fonts/sourcesans.woff
 - spec/fixtures/fonts/sourcesansa.css
 - spec/fixtures/fonts/sourcesansb.css
-- spec/fixtures/fonts/sourcesansc.css
-- spec/fixtures/fonts/sourcesanscbold.css
-- spec/fixtures/fonts/sourcesanscbold.otf
 - spec/index.html
 - spec/modules/custom_spec.js
 - spec/modules/fontdeck_spec.js

data/spec/fixtures/fonts/sourcesansc.css

@@ -1 +0,0 @@
-@font-face{font-family:SourceSansC;src:url(sourcesans.eot?#iefix) format('embedded-opentype'),url(sourcesans.woff) format('woff'),url(sourcesans.otf) format('opentype'),url(sourcesans.ttf) format('truetype'),url(sourcesans.svg#source_sans_proregular) format('svg');font-weight:normal;font-style:normal;}

data/spec/fixtures/fonts/sourcesanscbold.css

@@ -1 +0,0 @@
-@font-face{font-family:SourceSansC;src:url(sourcesanscbold.otf) format('opentype');font-weight:bold;font-style:normal;}