webfontloader 1.4.3 → 1.4.4

data/spec/core/useragentparser_spec.js

@@ -19,8 +19,8 @@ describe('UserAgentParser', function () {
           return false;
         }
 
-        if (actual.getVersion().ne(expected.version)) {
-          this.message = msg('version', actual.getVersion(), expected.version);
+        if (actual.getParsedVersion().ne(expected.version)) {
+          this.message = msg('version', actual.getParsedVersion(), expected.version);
           return false;
         }
 
@@ -29,8 +29,8 @@ describe('UserAgentParser', function () {
           return false;
         }
 
-        if (actual.getPlatformVersion().ne(expected.platformVersion)) {
-          this.message = msg('platform version', actual.getPlatformVersion(), expected.platformVersion);
+        if (actual.getParsedPlatformVersion().ne(expected.platformVersion)) {
+          this.message = msg('platform version', actual.getParsedPlatformVersion(), expected.platformVersion);
           return false;
         }
 
@@ -39,8 +39,8 @@ describe('UserAgentParser', function () {
           return false;
         }
 
-        if (actual.getEngineVersion().ne(expected.engineVersion)) {
-          this.message = msg('engine version', actual.getEngineVersion(), expected.engineVersion);
+        if (actual.getParsedEngineVersion().ne(expected.engineVersion)) {
+          this.message = msg('engine version', actual.getParsedEngineVersion(), expected.engineVersion);
           return false;
         }
 

data/spec/core/webfont_spec.js

@@ -2,13 +2,26 @@ describe('WebFont', function () {
   var WebFont = webfont.WebFont,
       UserAgent = webfont.UserAgent,
       BrowserInfo = webfont.BrowserInfo,
+      Version = webfont.Version,
       Font = webfont.Font,
       FontModuleLoader = webfont.FontModuleLoader,
       fontModuleLoader = null,
       userAgent = null;
 
   beforeEach(function () {
-    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
+    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)
+    );
     fontModuleLoader = new FontModuleLoader();
   });
 
@@ -121,7 +134,7 @@ describe('WebFont', function () {
     beforeEach(function () {
       font = new Font('Font1');
       jasmine.Clock.useMock();
-      webfont = new WebFont(window, fontModuleLoader, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false)));
+      webfont = new WebFont(window, fontModuleLoader, userAgent);
       webfont.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;
@@ -197,7 +210,7 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false)));
+      font = new WebFont(window, fontModuleLoader, userAgent);
 
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {};
@@ -228,7 +241,19 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(false, false, false)));
+      font = new WebFont(window, fontModuleLoader, 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(false, false, false)
+      ));
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;

data/spec/monotype/monotypescript_spec.js

@@ -2,7 +2,8 @@ describe('MonotypeScript', function () {
   var MonotypeScript = webfont.MonotypeScript,
       Font = webfont.Font,
       BrowserInfo = webfont.BrowserInfo,
-      UserAgent = webfont.UserAgent;
+      UserAgent = webfont.UserAgent,
+      Version = webfont.Version;
 
   var configuration = {
     projectId: '01e2ff27-25bf-4801-a23e-73d328e6c7cc',
@@ -28,7 +29,19 @@ describe('MonotypeScript', function () {
     };
     support = jasmine.createSpy('support');
     load = jasmine.createSpy('load');
-    useragent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
+    useragent = new UserAgent(
+      'Firefox',
+      new Version(3, 6),
+      '3.6',
+      'Gecko',
+      new Version(1, 9, 3),
+      '1.9.3',
+      'Macintosh',
+      new Version(10, 6),
+      '10.6',
+      undefined,
+      new BrowserInfo(true, false, false)
+    );
 
     monotype = new MonotypeScript(useragent, fakeDomHelper, configuration);
     monotype.supportUserAgent(useragent, support);

data/src/core/useragent.js

@@ -1,25 +1,49 @@
 goog.provide('webfont.UserAgent');
 
 /**
+ * A user agent string representation.
+ *
+ * This currently keeps a string and parsed `Version` representation
+ * of version strings. This is done for backwards compatibility with
+ * older versions of Typekit's KitJS when loaded through the Web Font
+ * Loader. The old string based API is deprecated and will eventually
+ * be removed.
+ *
  * @export
  * @param {string} name
  * @param {webfont.Version} version
+ * @param {string} versionString
  * @param {string} engine
  * @param {webfont.Version} engineVersion
+ * @param {string} engineVersionString
  * @param {string} platform
  * @param {webfont.Version} platformVersion
+ * @param {string} platformVersionString
  * @param {number|undefined} documentMode
  * @param {!webfont.BrowserInfo} browserInfo
  * @constructor
  */
-webfont.UserAgent = function(name, version, engine, engineVersion, platform,
-    platformVersion, documentMode, browserInfo) {
+webfont.UserAgent = function(
+    name,
+    version,
+    versionString,
+    engine,
+    engineVersion,
+    engineVersionString,
+    platform,
+    platformVersion,
+    platformVersionString,
+    documentMode,
+    browserInfo) {
   this.name_ = name;
   this.version_ = version;
+  this.versionString_ = versionString;
   this.engine_ = engine;
   this.engineVersion_ = engineVersion;
+  this.engineVersionString_ = engineVersionString;
   this.platform_ = platform;
   this.platformVersion_ = platformVersion;
+  this.platformVersionString_ = platformVersionString;
   this.documentMode_ = documentMode;
   this.browserInfo_ = browserInfo;
 };
@@ -37,9 +61,17 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {webfont.Version}
+   * @deprecated
+   * @return {string}
    */
   UserAgent.prototype.getVersion = function() {
+    return this.versionString_;
+  };
+
+  /**
+   * @return {webfont.Version}
+   */
+  UserAgent.prototype.getParsedVersion = function() {
     return this.version_;
   };
 
@@ -53,9 +85,17 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {webfont.Version}
+   * @deprecated
+   * @return {string}
    */
   UserAgent.prototype.getEngineVersion = function() {
+    return this.engineVersionString_;
+  };
+
+  /**
+   * @return {webfont.Version}
+   */
+  UserAgent.prototype.getParsedEngineVersion = function() {
     return this.engineVersion_;
   };
 
@@ -69,9 +109,17 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {webfont.Version}
+   * @deprecated
+   * @return {string}
    */
   UserAgent.prototype.getPlatformVersion = function() {
+    return this.platformVersionString_;
+  };
+
+  /**
+   * @return {webfont.Version}
+   */
+  UserAgent.prototype.getParsedPlatformVersion = function() {
     return this.platformVersion_;
   };
 

data/src/core/useragentparser.js

@@ -37,9 +37,12 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     webfont.UserAgentParser.UNKNOWN,
     new webfont.Version(),
     webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
     new webfont.Version(),
     webfont.UserAgentParser.UNKNOWN,
+    webfont.UserAgentParser.UNKNOWN,
     new webfont.Version(),
+    webfont.UserAgentParser.UNKNOWN,
     undefined,
     new webfont.BrowserInfo(false, false, false));
 
@@ -144,16 +147,29 @@ goog.scope(function () {
    */
   UserAgentParser.prototype.parseIeUserAgentString_ = function() {
     var platform = this.getPlatform_(),
-        platformVersion = Version.parse(this.getPlatformVersionString_()),
-        browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /MSIE ([\d\w\.]+)/, 1)),
+        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) ||
                          (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, "MSIE", browserVersion,
-          platform, platformVersion, documentMode, new BrowserInfo(supportWebFont, false, false));
+    return new UserAgent(
+      "MSIE",
+      browserVersion,
+      browserVersionString,
+      "MSIE",
+      browserVersion,
+      browserVersionString,
+      platform,
+      platformVersion,
+      platformVersionString,
+      documentMode,
+      new BrowserInfo(supportWebFont, false, false)
+    );
   };
 
   /**
@@ -168,8 +184,10 @@ goog.scope(function () {
    */
   UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
     var engineName = UserAgentParser.UNKNOWN,
-        engineVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Presto\/([\d\w\.]+)/, 1)),
-        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        engineVersionString = this.getMatchingGroup_(this.userAgent_, /Presto\/([\d\w\.]+)/, 1),
+        engineVersion = Version.parse(engineVersionString),
+        platformVersionString = this.getPlatformVersionString_(),
+        platformVersion = Version.parse(platformVersionString),
         documentMode = this.getDocumentMode_(this.doc_);
 
     if (engineVersion.isValid()) {
@@ -178,35 +196,82 @@ goog.scope(function () {
       if (this.userAgent_.indexOf("Gecko") != -1) {
         engineName = "Gecko";
       }
-      engineVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1));
+      engineVersionString = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
+      engineVersion = Version.parse(engineVersionString);
     }
 
     // Check for Opera Mini first, since it looks like normal Opera
     if (this.userAgent_.indexOf("Opera Mini/") != -1) {
-      var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Opera Mini\/([\d\.]+)/, 1));
-
-      return new UserAgent("OperaMini", browserVersion, engineName,
-          engineVersion, this.getPlatform_(), platformVersion,
-          documentMode, new BrowserInfo(false, false, false));
+      var browserVersionString = this.getMatchingGroup_(this.userAgent_, /Opera Mini\/([\d\.]+)/, 1);
+      var browserVersion = Version.parse(browserVersionString);
+
+      return new UserAgent(
+        "OperaMini",
+        browserVersion,
+        browserVersionString,
+        engineName,
+        engineVersion,
+        engineVersionString,
+        this.getPlatform_(),
+        platformVersion,
+        platformVersionString,
+        documentMode,
+        new BrowserInfo(false, false, false)
+      );
     }
 
     // Otherwise, find version information for normal Opera or Opera Mobile
     if (this.userAgent_.indexOf("Version/") != -1) {
-      var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.]+)/, 1));
+      var browserVersionString = this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.]+)/, 1);
+      var browserVersion = Version.parse(browserVersionString);
 
       if (browserVersion.isValid()) {
-        return new UserAgent("Opera", browserVersion, engineName, engineVersion, this.getPlatform_(),
-                             platformVersion, documentMode, new BrowserInfo(browserVersion.major >= 10, false, false));
+        return new UserAgent(
+          "Opera",
+          browserVersion,
+          browserVersionString,
+          engineName,
+          engineVersion,
+          engineVersionString,
+          this.getPlatform_(),
+          platformVersion,
+          platformVersionString,
+          documentMode,
+          new BrowserInfo(browserVersion.major >= 10, false, false)
+        );
       }
     }
-    var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1));
+    var browserVersionString = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
+    var browserVersion = Version.parse(browserVersionString);
 
     if (browserVersion.isValid()) {
-      return new UserAgent("Opera", browserVersion, engineName, engineVersion, this.getPlatform_(),
-                           platformVersion, documentMode, new BrowserInfo(browserVersion.major >= 10, false, false));
+      return new UserAgent(
+        "Opera",
+        browserVersion,
+        browserVersionString,
+        engineName,
+        engineVersion,
+        engineVersionString,
+        this.getPlatform_(),
+        platformVersion,
+        platformVersionString,
+        documentMode,
+        new BrowserInfo(browserVersion.major >= 10, false, false)
+      );
     }
-    return new UserAgent("Opera", new Version(), engineName, engineVersion, this.getPlatform_(),
-                         platformVersion, documentMode, new BrowserInfo(false, false, false));
+    return new UserAgent(
+      "Opera",
+      new Version(),
+      UserAgentParser.UNKNOWN,
+      engineName,
+      engineVersion,
+      engineVersionString,
+      this.getPlatform_(),
+      platformVersion,
+      platformVersionString,
+      documentMode,
+      new BrowserInfo(false, false, false)
+    );
   };
 
   /**
@@ -221,10 +286,13 @@ goog.scope(function () {
    */
   UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
     var platform = this.getPlatform_(),
-        platformVersion = Version.parse(this.getPlatformVersionString_()),
-        webKitVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /AppleWeb(?:K|k)it\/([\d\.\+]+)/, 1)),
+        platformVersionString = this.getPlatformVersionString_(),
+        platformVersion = Version.parse(platformVersionString),
+        webKitVersionString = this.getMatchingGroup_(this.userAgent_, /AppleWeb(?:K|k)it\/([\d\.\+]+)/, 1),
+        webKitVersion = Version.parse(webKitVersionString),
         browserName = UserAgentParser.UNKNOWN,
         browserVersion = new Version(),
+        browserVersionString = UserAgentParser.UNKNOWN,
         supportWebFont = false;
 
     if (this.userAgent_.indexOf("Chrome") != -1 ||
@@ -266,8 +334,19 @@ goog.scope(function () {
     var hasWebKitFallbackBug = webKitVersion.major < 536 || (webKitVersion.major == 536 && webKitVersion.minor < 11),
         hasWebKitMetricsBug = platform == 'iPhone' || platform == 'iPad' || platform == 'iPod' || platform == 'Macintosh';
 
-    return new UserAgent(browserName, browserVersion, "AppleWebKit", webKitVersion, platform, platformVersion,
-                         this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug));
+    return new UserAgent(
+      browserName,
+      browserVersion,
+      browserVersionString,
+      "AppleWebKit",
+      webKitVersion,
+      webKitVersionString,
+      platform,
+      platformVersion,
+      platformVersionString,
+      this.getDocumentMode_(this.doc_),
+      new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug)
+    );
   };
 
   /**
@@ -283,12 +362,15 @@ goog.scope(function () {
   UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
     var name = UserAgentParser.UNKNOWN,
         version = new Version(),
-        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        versionString = UserAgentParser.UNKNOWN,
+        platformVersionString = this.getPlatformVersionString_(),
+        platformVersion = Version.parse(platformVersionString),
         supportWebFont = false;
 
     if (this.userAgent_.indexOf("Firefox") != -1) {
       name = "Firefox";
-      version = Version.parse(this.getMatchingGroup_(this.userAgent_, /Firefox\/([\d\w\.]+)/, 1));
+      versionString = this.getMatchingGroup_(this.userAgent_, /Firefox\/([\d\w\.]+)/, 1);
+      version = Version.parse(versionString);
       supportWebFont = version.major >= 3 && version.minor >= 5;
     } else if (this.userAgent_.indexOf("Mozilla") != -1) {
       name = "Mozilla";
@@ -304,8 +386,19 @@ goog.scope(function () {
                        engineVersionString.match(/1\.9\.1b[123]/) != null ||
                        engineVersionString.match(/1\.9\.1\.[\d\.]+/) != null;
     }
-    return new UserAgent(name, version, "Gecko", engineVersion,
-        this.getPlatform_(), platformVersion, this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, false, false));
+    return new UserAgent(
+      name,
+      version,
+      versionString,
+      "Gecko",
+      engineVersion,
+      engineVersionString,
+      this.getPlatform_(),
+      platformVersion,
+      platformVersionString,
+      this.getDocumentMode_(this.doc_),
+      new BrowserInfo(supportWebFont, false, false)
+    );
   };
 
   /**