webfontloader 1.0.26 → 1.0.27

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.0.27 (April 20, 2012)
+* Updated DomHelper to not require a UserAgent instance. Feature-detection is not used instead of UA detection for switching DOM methods.
+
 v1.0.26 (February 8, 2012)
 * Updated the included version of the Closure JS compiler jar to 1741, to handle newer annotation styles.
 * Added a missing param annotation for the new FontWatcher.watch argument.

data/lib/webfontloader.rb

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

data/src-test/core/domhelpertest.js

@@ -1,8 +1,7 @@
 var DomHelperTest = TestCase('DomHelperTest');
 
 DomHelperTest.prototype.setUp = function() {
-  this.domHelper_ = new webfont.DomHelper(document, new webfont.UserAgent("name", "version",
-      "engine", "engineVersion", "platform", "platformVersion", true));
+  this.domHelper_ = new webfont.DomHelper(document);
 };
 
 DomHelperTest.prototype.testCreateElementNoAttr = function() {
@@ -90,4 +89,20 @@ DomHelperTest.prototype.testHasClassName = function() {
   assertTrue(this.domHelper_.hasClassName(div, 'moo-meuh'));
   assertFalse(this.domHelper_.hasClassName(div, 'meuh'));
   assertFalse(this.domHelper_.hasClassName(div, 'missingClassName'));
-}
+};
+
+DomHelperTest.prototype.testSetStyle = function() {
+  var e = this.domHelper_.createElement('span')
+  this.domHelper_.setStyle(e, 'left:3px;top:1px;');
+  assertEquals('3px', e.style.left)
+  assertEquals('1px', e.style.top);
+};
+
+DomHelperTest.prototype.testHasSupportForStyle = function() {
+  assertUndefined(this.domHelper_.supportForStyle_);
+  assertBoolean(this.domHelper_.hasSupportForStyle_());
+  this.domHelper_.supportForStyle_ = false;
+  assertFalse(this.domHelper_.hasSupportForStyle_());
+  this.domHelper_.supportForStyle_ = true;
+  assertTrue(this.domHelper_.hasSupportForStyle_());
+};

data/src/ascender/ascender_script.js

@@ -79,8 +79,6 @@ webfont.AscenderScript.prototype.parseVariations = function(source){
 };
 
 window['WebFont'].addModule(webfont.AscenderScript.NAME, function(configuration) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var domHelper = new webfont.DomHelper(document, userAgent);
+  var domHelper = new webfont.DomHelper(document);
   return new webfont.AscenderScript(domHelper, configuration);
 });

data/src/core/domhelper.js

@@ -2,12 +2,13 @@
  * Handles common DOM manipulation tasks. The aim of this library is to cover
  * the needs of typical font loading. Not more, not less.
  * @param {HTMLDocument} doc The HTML document we'll manipulate.
- * @param {webfont.UserAgent} userAgent The current user agent.
  * @constructor
  */
-webfont.DomHelper = function(doc, userAgent) {
+webfont.DomHelper = function(doc) {
   this.document_ = doc;
-  this.userAgent_ = userAgent;
+
+  /** @type {boolean|undefined} */
+  this.supportForStyle_ = undefined;
 };
 
 /**
@@ -171,9 +172,25 @@ webfont.DomHelper.prototype.hasClassName = function(e, name) {
  * @param {string} styleString The style string.
  */
 webfont.DomHelper.prototype.setStyle = function(e, styleString) {
-  if (this.userAgent_.getName() == "MSIE") {
-    e.style.cssText = styleString;
-  } else {
+  if (this.hasSupportForStyle_()) {
     e.setAttribute("style", styleString);
+  } else {
+    e.style.cssText = styleString;
+  }
+};
+
+/**
+ * Check if getting and setting the style attribute on an element with
+ * getAttribute/setAttribute is supported. In old IE, you must use style.cssText
+ * instead. Feature detection is only done the first time this is called.
+ * @private
+ * @return {boolean} Whether or not the feature is supported.
+ */
+webfont.DomHelper.prototype.hasSupportForStyle_ = function() {
+  if (this.supportForStyle_ === undefined) {
+    var e = this.document_.createElement('p');
+    e.innerHTML = '<a style="top:1px;">w</a>';
+    this.supportForStyle_ = /top/.test(e.getElementsByTagName('a')[0].getAttribute('style'));
   }
+  return this.supportForStyle_
 };

data/src/core/initialize.js

@@ -5,7 +5,7 @@ var globalName = 'WebFont';
 window[globalName] = (function() {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
-  var domHelper = new webfont.DomHelper(document, userAgent);
+  var domHelper = new webfont.DomHelper(document);
   var asyncCall = function(func, timeout) { setTimeout(func, timeout); };
 
   return new webfont.WebFont(domHelper, new webfont.FontModuleLoader(),

data/src/custom/customcss.js

@@ -32,8 +32,6 @@ webfont.CustomCss.prototype.supportUserAgent = function(userAgent, support) {
 };
 
 window['WebFont'].addModule(webfont.CustomCss.NAME, function(configuration) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var domHelper = new webfont.DomHelper(document, userAgent);
+  var domHelper = new webfont.DomHelper(document);
   return new webfont.CustomCss(domHelper, configuration);
 });

data/src/fontdeck/fontdeck_script.js

@@ -56,8 +56,6 @@ webfont.FontdeckScript.prototype.load = function(onReady) {
 };
 
 window['WebFont'].addModule(webfont.FontdeckScript.NAME, function(configuration) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var domHelper = new webfont.DomHelper(document, userAgent);
+  var domHelper = new webfont.DomHelper(document);
   return new webfont.FontdeckScript(window, domHelper, configuration);
 });

data/src/google/googlefontapi.js

@@ -51,6 +51,6 @@ webfont.GoogleFontApi.prototype.insertLink_ = function(onReady) {
 window['WebFont'].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, userAgent), configuration);
+  return new webfont.GoogleFontApi(userAgent, new webfont.DomHelper(document),
+      configuration);
 });

data/src/monotype/monotype_script.js

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

data/src/typekit/typekit_script.js

@@ -54,9 +54,7 @@ webfont.TypekitScript.prototype.load = function(onReady) {
 };
 
 window['WebFont'].addModule(webfont.TypekitScript.NAME, function(configuration) {
-  var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
-  var userAgent = userAgentParser.parse();
-  var domHelper = new webfont.DomHelper(document, userAgent);
+  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.26'
-  s.date              = '2012-02-15'
+  s.version           = '1.0.27'
+  s.date              = '2012-04-20'
 
   ## 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: 35
+  hash: 33
   prerelease: 
   segments: 
   - 1
   - 0
-  - 26
-  version: 1.0.26
+  - 27
+  version: 1.0.27
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 -08:00
-default_executable: 
+date: 2012-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +31,11 @@ dependencies:
         - 2
         - 1
         version: 1.2.1
-  prerelease: false
   requirement: *id001
   name: rack
   type: :development
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +46,11 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  prerelease: false
   requirement: *id002
   name: sinatra
   type: :development
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,7 +62,6 @@ dependencies:
         - 1
         - 6
         version: 0.1.6
-  prerelease: false
   requirement: *id003
   name: vegas
   type: :development
@@ -166,7 +165,6 @@ files:
 - tools/compiler/compiler.jar
 - tools/jstestdriver/JsTestDriver-1.2.1.jar
 - webfontloader.gemspec
-has_rdoc: true
 homepage: http://github.com/typekit/webfontloader
 licenses: []
 
@@ -196,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: WebFont Loader gives you added control when using linked fonts via @font-face.