webfontloader 1.3.0 → 1.3.1

data/src/core/fontruler.js

@@ -1,61 +1,70 @@
+goog.provide('webfont.FontRuler');
+
+goog.require('webfont.CssFontFamilyName');
+goog.require('webfont.FontVariationDescription');
+goog.require('webfont.Size');
+
 /**
  * An element that can be used to measure the metrics
  * of a given font and string.
  * @constructor
  * @param {webfont.DomHelper} domHelper
- * @param {Object.<string, function(Object): webfont.Size>} fontSizer
  * @param {string} fontTestString
  */
-webfont.FontRuler = function(domHelper, fontSizer, fontTestString) {
+webfont.FontRuler = function(domHelper, fontTestString) {
   this.domHelper_ = domHelper;
-  this.fontSizer_ = fontSizer;
   this.fontTestString_ = fontTestString;
   this.nameHelper_ = new webfont.CssFontFamilyName();
   this.fvd_ = new webfont.FontVariationDescription();
   this.el_ = this.domHelper_.createElement('span', {}, this.fontTestString_);
 };
 
-/**
- * @param {string} fontFamily
- * @param {string=} opt_fontDescription
- */
-webfont.FontRuler.prototype.setFont = function(fontFamily, opt_fontDescription) {
-  var styleString = this.computeStyleString_(fontFamily, opt_fontDescription);
-  this.domHelper_.setStyle(this.el_, styleString);
-};
+goog.scope(function () {
+  var FontRuler = webfont.FontRuler,
+      Size = webfont.Size;
 
-/**
- * Inserts the ruler into the DOM.
- */
-webfont.FontRuler.prototype.insert = function() {
-  this.domHelper_.insertInto('body', this.el_);
-};
+  /**
+   * @param {string} fontFamily
+   * @param {string=} opt_fontDescription
+   */
+  FontRuler.prototype.setFont = function(fontFamily, opt_fontDescription) {
+    var styleString = this.computeStyleString_(fontFamily, opt_fontDescription);
+    this.domHelper_.setStyle(this.el_, styleString);
+  };
 
-/**
- * @private
- * @param {string} fontFamily
- * @param {string=} opt_fontDescription
- * @return {string}
- */
-webfont.FontRuler.prototype.computeStyleString_ = function(fontFamily, opt_fontDescription) {
-  var variationCss = opt_fontDescription ? this.fvd_.expand(opt_fontDescription) : '';
-  var styleString = "position:absolute;top:-999px;left:-999px;" +
-      "font-size:300px;width:auto;height:auto;line-height:normal;margin:0;" +
-      "padding:0;font-variant:normal;white-space:nowrap;font-family:" +
-      this.nameHelper_.quote(fontFamily) + ";" + variationCss;
-  return styleString;
-};
+  /**
+   * Inserts the ruler into the DOM.
+   */
+  FontRuler.prototype.insert = function() {
+    this.domHelper_.insertInto('body', this.el_);
+  };
 
-/**
- * @return {webfont.Size}
- */
-webfont.FontRuler.prototype.getSize = function() {
-  return this.fontSizer_.getSize(this.el_);
-};
+  /**
+   * @private
+   * @param {string} fontFamily
+   * @param {string=} opt_fontDescription
+   * @return {string}
+   */
+  FontRuler.prototype.computeStyleString_ = function(fontFamily, opt_fontDescription) {
+    var variationCss = opt_fontDescription ? this.fvd_.expand(opt_fontDescription) : '';
+    var styleString = "position:absolute;top:-999px;left:-999px;" +
+        "font-size:300px;width:auto;height:auto;line-height:normal;margin:0;" +
+        "padding:0;font-variant:normal;white-space:nowrap;font-family:" +
+        this.nameHelper_.quote(fontFamily) + ";" + variationCss;
+    return styleString;
+  };
 
-/**
- * Removes the ruler element from the DOM.
- */
-webfont.FontRuler.prototype.remove = function() {
-  this.domHelper_.removeElement(this.el_);
-};
+  /**
+   * @return {webfont.Size}
+   */
+  FontRuler.prototype.getSize = function() {
+    return new Size(this.el_.offsetWidth, this.el_.offsetHeight);
+  };
+
+  /**
+   * Removes the ruler element from the DOM.
+   */
+  FontRuler.prototype.remove = function() {
+    this.domHelper_.removeElement(this.el_);
+  };
+});

data/src/core/fontvariationdescription.js

@@ -1,3 +1,5 @@
+goog.provide('webfont.FontVariationDescription');
+
 /**
  * @constructor
  */
@@ -38,97 +40,101 @@ webfont.FontVariationDescription.VALUES = {
   ]
 };
 
-/**
- * @private
- * @constructor
- */
-webfont.FontVariationDescription.Item = function(index, property, values) {
-  this.index_ = index;
-  this.property_ = property;
-  this.values_ = values;
-}
-
-webfont.FontVariationDescription.Item.prototype.compact = function(output, value) {
-  for (var i = 0; i < this.values_.length; i++) {
-    if (value == this.values_[i][1]) {
-      output[this.index_] = this.values_[i][0];
-      return;
-    }
+goog.scope(function () {
+  var FontVariationDescription = webfont.FontVariationDescription;
+
+  /**
+   * @private
+   * @constructor
+   */
+  FontVariationDescription.Item = function(index, property, values) {
+    this.index_ = index;
+    this.property_ = property;
+    this.values_ = values;
   }
-}
 
-webfont.FontVariationDescription.Item.prototype.expand = function(output, value) {
-  for (var i = 0; i < this.values_.length; i++) {
-    if (value == this.values_[i][0]) {
-      output[this.index_] = this.property_ + ':' + this.values_[i][1];
-      return;
+  FontVariationDescription.Item.prototype.compact = function(output, value) {
+    for (var i = 0; i < this.values_.length; i++) {
+      if (value == this.values_[i][1]) {
+        output[this.index_] = this.values_[i][0];
+        return;
+      }
     }
   }
-}
 
-/**
- * Compacts CSS declarations into an FVD.
- * @param {string} input A string of CSS declarations such as
- *    'font-weight:normal;font-style:italic'.
- * @return {string} The equivalent FVD such as 'n4'.
- */
-webfont.FontVariationDescription.prototype.compact = function(input) {
-  var result = ['n', '4'];
-  var descriptors = input.split(';');
-
-  for (var i = 0, len = descriptors.length; i < len; i++) {
-    var pair = descriptors[i].replace(/\s+/g, '').split(':');
-    if (pair.length == 2) {
-      var property = pair[0];
-      var value = pair[1];
-      var item = this.getItem_(property);
-      if (item) {
-        item.compact(result, value);
+  FontVariationDescription.Item.prototype.expand = function(output, value) {
+    for (var i = 0; i < this.values_.length; i++) {
+      if (value == this.values_[i][0]) {
+        output[this.index_] = this.property_ + ':' + this.values_[i][1];
+        return;
       }
     }
   }
 
-  return result.join('');
-};
+  /**
+   * Compacts CSS declarations into an FVD.
+   * @param {string} input A string of CSS declarations such as
+   *    'font-weight:normal;font-style:italic'.
+   * @return {string} The equivalent FVD such as 'n4'.
+   */
+  FontVariationDescription.prototype.compact = function(input) {
+    var result = ['n', '4'];
+    var descriptors = input.split(';');
 
-/**
- * Expands a FVD string into equivalent CSS declarations.
- * @param {string} fvd The FVD string, such as 'n4'.
- * @return {?string} The equivalent CSS such as
- *    'font-weight:normal;font-style:italic' or null if it cannot be parsed.
- */
-webfont.FontVariationDescription.prototype.expand = function(fvd) {
-  if (fvd.length != 2) {
-    return null;
-  }
+    for (var i = 0, len = descriptors.length; i < len; i++) {
+      var pair = descriptors[i].replace(/\s+/g, '').split(':');
+      if (pair.length == 2) {
+        var property = pair[0];
+        var value = pair[1];
+        var item = this.getItem_(property);
+        if (item) {
+          item.compact(result, value);
+        }
+      }
+    }
 
-  var result = [null, null];
+    return result.join('');
+  };
 
-  for (var i = 0, len = this.properties_.length; i < len; i++) {
-    var property = this.properties_[i];
-    var key = fvd.substr(i, 1);
-    var values = this.values_[property];
-    var item = new webfont.FontVariationDescription.Item(i, property, values);
-    item.expand(result, key);
-  }
+  /**
+   * Expands a FVD string into equivalent CSS declarations.
+   * @param {string} fvd The FVD string, such as 'n4'.
+   * @return {?string} The equivalent CSS such as
+   *    'font-weight:normal;font-style:italic' or null if it cannot be parsed.
+   */
+  FontVariationDescription.prototype.expand = function(fvd) {
+    if (fvd.length != 2) {
+      return null;
+    }
 
-  if (result[0] && result[1]) {
-    return result.join(';') + ';';
-  } else {
-    return null;
-  }
-}
+    var result = [null, null];
 
-/**
- * @private
- */
-webfont.FontVariationDescription.prototype.getItem_ = function(property) {
-  for (var i = 0; i < this.properties_.length; i++) {
-    if (property == this.properties_[i]) {
+    for (var i = 0, len = this.properties_.length; i < len; i++) {
+      var property = this.properties_[i];
+      var key = fvd.substr(i, 1);
       var values = this.values_[property];
-      return new webfont.FontVariationDescription.Item(i, property, values);
+      var item = new webfont.FontVariationDescription.Item(i, property, values);
+      item.expand(result, key);
+    }
+
+    if (result[0] && result[1]) {
+      return result.join(';') + ';';
+    } else {
+      return null;
     }
   }
 
-  return null;
-};
+  /**
+   * @private
+   */
+  FontVariationDescription.prototype.getItem_ = function(property) {
+    for (var i = 0; i < this.properties_.length; i++) {
+      if (property == this.properties_[i]) {
+        var values = this.values_[property];
+        return new webfont.FontVariationDescription.Item(i, property, values);
+      }
+    }
+
+    return null;
+  };
+});

data/src/core/fontwatcher.js

@@ -1,20 +1,17 @@
+goog.provide('webfont.FontWatcher');
+
+goog.require('webfont.FontWatchRunner');
+
 /**
  * @constructor
  * @param {webfont.UserAgent} userAgent
  * @param {webfont.DomHelper} domHelper
  * @param {webfont.EventDispatcher} eventDispatcher
- * @param {Object.<string, function(Object): webfont.Size>} fontSizer
- * @param {function(function(), number=)} asyncCall
- * @param {function(): number} getTime
  * @param {number=} opt_timeout
  */
-webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, fontSizer,
-    asyncCall, getTime, opt_timeout) {
+webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, opt_timeout) {
   this.domHelper_ = domHelper;
   this.eventDispatcher_ = eventDispatcher;
-  this.fontSizer_ = fontSizer;
-  this.asyncCall_ = asyncCall;
-  this.getTime_ = getTime;
   this.currentlyWatched_ = 0;
   this.last_ = false;
   this.success_ = false;
@@ -29,95 +26,103 @@ webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, fontSizer,
  */
 webfont.FontWatcher.DEFAULT_VARIATION = 'n4';
 
-/**
- * Watches a set of font families.
- * @param {Array.<string>} fontFamilies The font family names to watch.
- * @param {Object.<string, Array.<string>>} fontDescriptions The font variations
- *     of each family to watch. Described with FVD.
- * @param {Object.<string, string>} fontTestStrings The font test strings for
- *     each family.
- * @param {function(new:webfont.FontWatchRunner, function(string, string),
- *     function(string, string), webfont.DomHelper,
- *     Object.<string, function(Object): number>,
- *     function(function(), number=), function(): number, string, string,
- *     webfont.BrowserInfo, number=, Object.<string,boolean>=, string=)} fontWatchRunnerCtor The font watch runner constructor.
- * @param {boolean} last True if this is the last set of families to watch.
- */
-webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,
-    fontTestStrings, fontWatchRunnerCtor, last) {
-  var length = fontFamilies.length;
-
-  if (length === 0) {
-    this.eventDispatcher_.dispatchInactive();
-    return;
-  }
-
-  for (var i = 0; i < length; i++) {
-    var fontFamily = fontFamilies[i];
-    if (!fontDescriptions[fontFamily]) {
-      fontDescriptions[fontFamily] = [webfont.FontWatcher.DEFAULT_VARIATION];
+goog.scope(function () {
+  var FontWatcher = webfont.FontWatcher;
+
+  /**
+   * Watches a set of font families.
+   * @param {Array.<string>} fontFamilies The font family names to watch.
+   * @param {Object.<string, Array.<string>>} fontDescriptions The font variations
+   *     of each family to watch. Described with FVD.
+   * @param {Object.<string, string>} fontTestStrings The font test strings for
+   *     each family.
+   * @param {function(new:webfont.FontWatchRunner,
+   *                  function(string, string),
+   *                  function(string, string),
+   *                  webfont.DomHelper,
+   *                  string,
+   *                  string,
+   *                  webfont.BrowserInfo,
+   *                  number=,
+   *                  Object.<string, boolean>=,
+   *                  string=)} fontWatchRunnerCtor The font watch runner constructor.
+   * @param {boolean} last True if this is the last set of families to watch.
+   */
+  FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,
+      fontTestStrings, fontWatchRunnerCtor, last) {
+    var length = fontFamilies.length;
+
+    if (length === 0) {
+      this.eventDispatcher_.dispatchInactive();
+      return;
     }
-    this.currentlyWatched_ += fontDescriptions[fontFamily].length;
-  }
 
-  if (last) {
-    this.last_ = last;
-  }
+    for (var i = 0; i < length; i++) {
+      var fontFamily = fontFamilies[i];
+      if (!fontDescriptions[fontFamily]) {
+        fontDescriptions[fontFamily] = [webfont.FontWatcher.DEFAULT_VARIATION];
+      }
+      this.currentlyWatched_ += fontDescriptions[fontFamily].length;
+    }
 
-  for (var i = 0; i < length; i++) {
-    var fontFamily = fontFamilies[i];
-    var descriptions = fontDescriptions[fontFamily];
-    var fontTestString  = fontTestStrings[fontFamily];
+    if (last) {
+      this.last_ = last;
+    }
 
-    for (var j = 0, len = descriptions.length; j < len; j++) {
-      var fontDescription = descriptions[j];
+    for (var i = 0; i < length; i++) {
+      var fontFamily = fontFamilies[i];
+      var descriptions = fontDescriptions[fontFamily];
+      var fontTestString  = fontTestStrings[fontFamily];
 
-      this.eventDispatcher_.dispatchFontLoading(fontFamily, fontDescription);
+      for (var j = 0, len = descriptions.length; j < len; j++) {
+        var fontDescription = descriptions[j];
 
-      var activeCallback = webfont.bind(this, this.fontActive_);
-      var inactiveCallback = webfont.bind(this, this.fontInactive_)
-      var fontWatchRunner = new fontWatchRunnerCtor(activeCallback,
-          inactiveCallback, this.domHelper_, this.fontSizer_, this.asyncCall_,
-          this.getTime_, fontFamily, fontDescription,
-          this.browserInfo_, this.timeout_, null, fontTestString);
+        this.eventDispatcher_.dispatchFontLoading(fontFamily, fontDescription);
 
-      fontWatchRunner.start();
+        var activeCallback = goog.bind(this.fontActive_, this);
+        var inactiveCallback = goog.bind(this.fontInactive_, this);
+        var fontWatchRunner = new fontWatchRunnerCtor(activeCallback,
+            inactiveCallback, this.domHelper_, fontFamily, fontDescription,
+            this.browserInfo_, this.timeout_, null, fontTestString);
+
+        fontWatchRunner.start();
+      }
     }
-  }
-};
+  };
 
-/**
- * Called by a FontWatchRunner when a font has been detected as active.
- * @param {string} fontFamily
- * @param {string} fontDescription
- * @private
- */
-webfont.FontWatcher.prototype.fontActive_ = function(fontFamily, fontDescription) {
-  this.eventDispatcher_.dispatchFontActive(fontFamily, fontDescription);
-  this.success_ = true;
-  this.decreaseCurrentlyWatched_();
-};
+  /**
+   * Called by a FontWatchRunner when a font has been detected as active.
+   * @param {string} fontFamily
+   * @param {string} fontDescription
+   * @private
+   */
+  FontWatcher.prototype.fontActive_ = function(fontFamily, fontDescription) {
+    this.eventDispatcher_.dispatchFontActive(fontFamily, fontDescription);
+    this.success_ = true;
+    this.decreaseCurrentlyWatched_();
+  };
 
-/**
- * Called by a FontWatchRunner when a font has been detected as inactive.
- * @param {string} fontFamily
- * @param {string} fontDescription
- * @private
- */
-webfont.FontWatcher.prototype.fontInactive_ = function(fontFamily, fontDescription) {
-  this.eventDispatcher_.dispatchFontInactive(fontFamily, fontDescription);
-  this.decreaseCurrentlyWatched_();
-};
+  /**
+   * Called by a FontWatchRunner when a font has been detected as inactive.
+   * @param {string} fontFamily
+   * @param {string} fontDescription
+   * @private
+   */
+  FontWatcher.prototype.fontInactive_ = function(fontFamily, fontDescription) {
+    this.eventDispatcher_.dispatchFontInactive(fontFamily, fontDescription);
+    this.decreaseCurrentlyWatched_();
+  };
 
-/**
- * @private
- */
-webfont.FontWatcher.prototype.decreaseCurrentlyWatched_ = function() {
-  if (--this.currentlyWatched_ == 0 && this.last_) {
-    if (this.success_) {
-      this.eventDispatcher_.dispatchActive();
-    } else {
-      this.eventDispatcher_.dispatchInactive();
+  /**
+   * @private
+   */
+  FontWatcher.prototype.decreaseCurrentlyWatched_ = function() {
+    if (--this.currentlyWatched_ == 0 && this.last_) {
+      if (this.success_) {
+        this.eventDispatcher_.dispatchActive();
+      } else {
+        this.eventDispatcher_.dispatchInactive();
+      }
     }
-  }
-};
+  };
+});