webfontloader 1.0.29 → 1.0.30

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.0.30 (August 17, 2012)
+* Added support for detecting the Windows Phone platform in UserAgentParser, which supports web fonts at version 8 and above.
+* Changes to make the global namespace of the library easier to configure when used in 3rd-party projects. (Thanks cbosco!)
+
 v1.0.29 (July 26, 2012)
 * Added test to ensure Firefox for Android is properly detected as "Firefox" by UserAgentParser.
 * Added test to ensure Opera Mobile for Android is properly detected as "Opera" by UserAgentParser.

data/lib/webfontloader.rb

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

data/src-test/core/useragenttest.js

@@ -148,6 +148,38 @@ UserAgentTest.prototype.testBrowserIsIEMinimal = function() {
   assertTrue(userAgent.isSupportingWebFont());
 };
 
+UserAgentTest.prototype.testBrowserIsIEOnWindowsPhone = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; ARM; Touch; IEMobile/10.0; <Manufacturer>; <Device>; <Operator>)",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("MSIE", userAgent.getName());
+  assertEquals("10.0", userAgent.getVersion());
+  assertEquals("Windows Phone", userAgent.getPlatform());
+  assertEquals("8.0", userAgent.getPlatformVersion());
+  assertEquals("MSIE", userAgent.getEngine());
+  assertEquals("10.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertTrue(userAgent.isSupportingWebFont());
+};
+
+UserAgentTest.prototype.testBrowserIsIEOnOldWindowsPhone = function() {
+  var userAgentParser = new webfont.UserAgentParser(
+      "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; SAMSUNG; SGH-i917)",
+      this.defaultDocument_);
+  var userAgent = userAgentParser.parse();
+
+  assertEquals("MSIE", userAgent.getName());
+  assertEquals("9.0", userAgent.getVersion());
+  assertEquals("Windows Phone", userAgent.getPlatform());
+  assertEquals("7.5", userAgent.getPlatformVersion());
+  assertEquals("MSIE", userAgent.getEngine());
+  assertEquals("9.0", userAgent.getEngineVersion());
+  assertEquals(undefined, userAgent.getDocumentMode());
+  assertFalse(userAgent.isSupportingWebFont());
+};
+
 UserAgentTest.prototype.testBrowserIsIPhone = function() {
   var userAgentParser = new webfont.UserAgentParser(
       "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16",

data/src/ascender/ascender_script.js

@@ -78,7 +78,7 @@ webfont.AscenderScript.prototype.parseVariations = function(source){
   return variations;
 };
 
-window['WebFont'].addModule(webfont.AscenderScript.NAME, function(configuration) {
+globalNamespaceObject.addModule(webfont.AscenderScript.NAME, function(configuration) {
   var domHelper = new webfont.DomHelper(document);
   return new webfont.AscenderScript(domHelper, configuration);
 });

data/src/async_load.js

@@ -1,3 +1,3 @@
 if (window['WebFontConfig']) {
-  window['WebFont']['load'](window['WebFontConfig']);
+  globalNamespaceObject['load'](window['WebFontConfig']);
 }

data/src/core/initialize.js

@@ -2,7 +2,7 @@
 var globalName = 'WebFont';
 
 // Provide an instance of WebFont in the global namespace.
-window[globalName] = (function() {
+var globalNamespaceObject = window[globalName] = (function() {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
   var domHelper = new webfont.DomHelper(document);
@@ -13,8 +13,8 @@ window[globalName] = (function() {
 })();
 
 // Export the public API.
-window[globalName]['load'] = window[globalName].load;
-window[globalName]['addModule'] = window[globalName].addModule;
+globalNamespaceObject['load'] = globalNamespaceObject.load;
+globalNamespaceObject['addModule'] = globalNamespaceObject.addModule;
 
 // Export the UserAgent API because we pass this object to external modules.
 webfont.UserAgent.prototype['getName'] = webfont.UserAgent.prototype.getName;

data/src/core/useragentparser.js

@@ -50,7 +50,7 @@ webfont.UserAgentParser.prototype.parse = function() {
  */
 webfont.UserAgentParser.prototype.getPlatform_ = function() {
   var mobileOs = this.getMatchingGroup_(this.userAgent_,
-      /(iPod|iPad|iPhone|Android)/, 1);
+      /(iPod|iPad|iPhone|Android|Windows Phone)/, 1);
 
   if (mobileOs != "") {
     return mobileOs;
@@ -76,6 +76,11 @@ webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
   if (genericVersion) {
     return genericVersion;
   }
+  var winPhoneVersion = this.getMatchingGroup_(this.userAgent_,
+      /Windows Phone( OS)? ([^;)]+)/, 2);
+  if (winPhoneVersion) {
+    return winPhoneVersion;
+  }
   var iVersion = this.getMatchingGroup_(this.userAgent_,
       /(iPhone )?OS ([\d_]+)/, 2);
   if (iVersion) {
@@ -101,25 +106,32 @@ webfont.UserAgentParser.prototype.isIe_ = function() {
  * @private
  */
 webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
+  // For IE we give MSIE as the engine name and the version of IE
+  // instead of the specific Trident engine name and version
+
+  var platform = this.getPlatform_();
+  var platformVersion = this.getPlatformVersion_();
+
   var browser = this.getMatchingGroup_(this.userAgent_, /(MSIE [\d\w\.]+)/, 1);
-  var engineName = webfont.UserAgentParser.UNKNOWN;
-  var engineVersion = webfont.UserAgentParser.UNKNOWN;
 
   if (browser != "") {
     var pair = browser.split(' ');
     var name = pair[0];
     var version = pair[1];
+    var majorVersion = this.getMajorVersion_(version);
+    var majorPlatformVersion = this.getMajorVersion_(platformVersion);
+
+    var supportWebFont = (platform == "Windows" && majorVersion >= 6) ||
+        (platform == "Windows Phone" && majorPlatformVersion >= 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 webfont.UserAgent(name, version, name, version,
-        this.getPlatform_(), this.getPlatformVersion_(),
-        this.getDocumentMode_(this.doc_), this.getMajorVersion_(version) >= 6);
+        platform, platformVersion, this.getDocumentMode_(this.doc_),
+        supportWebFont);
   }
+
   return new webfont.UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
       "MSIE", webfont.UserAgentParser.UNKNOWN,
-      this.getPlatform_(), this.getPlatformVersion_(),
-      this.getDocumentMode_(this.doc_), false);
+      platform, platformVersion, this.getDocumentMode_(this.doc_), false);
 };
 
 /**

data/src/custom/customcss.js

@@ -31,7 +31,7 @@ webfont.CustomCss.prototype.supportUserAgent = function(userAgent, support) {
   return support(userAgent.isSupportingWebFont());
 };
 
-window['WebFont'].addModule(webfont.CustomCss.NAME, function(configuration) {
+globalNamespaceObject.addModule(webfont.CustomCss.NAME, function(configuration) {
   var domHelper = new webfont.DomHelper(document);
   return new webfont.CustomCss(domHelper, configuration);
 });

data/src/fontdeck/fontdeck_script.js

@@ -55,7 +55,7 @@ webfont.FontdeckScript.prototype.load = function(onReady) {
   onReady(this.fontFamilies_, this.fontVariations_);
 };
 
-window['WebFont'].addModule(webfont.FontdeckScript.NAME, function(configuration) {
+globalNamespaceObject.addModule(webfont.FontdeckScript.NAME, function(configuration) {
   var domHelper = new webfont.DomHelper(document);
   return new webfont.FontdeckScript(window, domHelper, configuration);
-});
+});

data/src/google/googlefontapi.js

@@ -48,7 +48,7 @@ webfont.GoogleFontApi.prototype.insertLink_ = function(onReady) {
       fontApiParser.getFontTestStrings());
 };
 
-window['WebFont'].addModule(webfont.GoogleFontApi.NAME, function(configuration) {
+globalNamespaceObject.addModule(webfont.GoogleFontApi.NAME, function(configuration) {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
   return new webfont.GoogleFontApi(userAgent, new webfont.DomHelper(document),

data/src/monotype/monotype_script.js

@@ -97,7 +97,7 @@ webfont.MonotypeScript.prototype.protocol = function () {
   return defaultProtocol;
 };
 
-window['WebFont'].addModule(webfont.MonotypeScript.NAME, function (configuration) {
+globalNamespaceObject.addModule(webfont.MonotypeScript.NAME, function (configuration) {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
   var domHelper = new webfont.DomHelper(document);

data/src/typekit/typekit_script.js

@@ -53,7 +53,7 @@ webfont.TypekitScript.prototype.load = function(onReady) {
   onReady(this.fontFamilies_, this.fontVariations_);
 };
 
-window['WebFont'].addModule(webfont.TypekitScript.NAME, function(configuration) {
+globalNamespaceObject.addModule(webfont.TypekitScript.NAME, function(configuration) {
   var domHelper = new webfont.DomHelper(document);
   return new webfont.TypekitScript(window, domHelper, configuration);
 });

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.0.29'
-  s.date              = '2012-07-26'
+  s.version           = '1.0.30'
+  s.date              = '2012-08-17'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 1
   - 0
-  - 29
-  version: 1.0.29
+  - 30
+  version: 1.0.30
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-26 00:00:00 Z
+date: 2012-08-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false