webfontloader 1.3.0 → 1.3.1

data/src/core/cssclassname.js

@@ -1,3 +1,5 @@
+goog.provide('webfont.CssClassName');
+
 /**
  * Handles sanitization and construction of css class names.
  * @param {string=} opt_joinChar The character to join parts of the name on.
@@ -15,27 +17,30 @@ webfont.CssClassName = function(opt_joinChar) {
  */
 webfont.CssClassName.DEFAULT_JOIN_CHAR = '-';
 
-/**
- * Sanitizes a string for use as a css class name. Removes non-word and
- * underscore characters.
- * @param {string} name The string.
- * @return {string} The sanitized string.
- */
-webfont.CssClassName.prototype.sanitize = function(name) {
-  return name.replace(/[\W_]+/g, '').toLowerCase();
-};
+goog.scope(function () {
+  var CssClassName = webfont.CssClassName;
 
-/**
- * Builds a complete css class name given a variable number of parts.
- * Sanitizes, then joins the parts together.
- * @param {...string} var_args The parts to join.
- * @return {string} The sanitized and joined string.
- */
-webfont.CssClassName.prototype.build = function(var_args) {
-  var parts = []
-  for (var i = 0; i < arguments.length; i++) {
-    parts.push(this.sanitize(arguments[i]));
-  }
-  return parts.join(this.joinChar_);
-};
+  /**
+   * Sanitizes a string for use as a css class name. Removes non-word and
+   * underscore characters.
+   * @param {string} name The string.
+   * @return {string} The sanitized string.
+   */
+  CssClassName.prototype.sanitize = function(name) {
+    return name.replace(/[\W_]+/g, '').toLowerCase();
+  };
 
+  /**
+   * Builds a complete css class name given a variable number of parts.
+   * Sanitizes, then joins the parts together.
+   * @param {...string} var_args The parts to join.
+   * @return {string} The sanitized and joined string.
+   */
+  CssClassName.prototype.build = function(var_args) {
+    var parts = []
+    for (var i = 0; i < arguments.length; i++) {
+      parts.push(this.sanitize(arguments[i]));
+    }
+    return parts.join(this.joinChar_);
+  };
+});

data/src/core/cssfontfamilyname.js

@@ -1,3 +1,5 @@
+goog.provide('webfont.CssFontFamilyName');
+
 /**
  * Handles quoting rules for a font family name in css.
  * @constructor
@@ -7,21 +9,25 @@ webfont.CssFontFamilyName = function() {
   this.quote_ = "'";
 };
 
-/**
- * Quotes the name.
- * @param {string} name The name to quote.
- * @return {string} The quoted name.
- */
-webfont.CssFontFamilyName.prototype.quote = function(name) {
-  var quoted = [];
-  var split = name.split(/,\s*/);
-  for (var i = 0; i < split.length; i++) {
-    var part = split[i].replace(/['"]/g, '');
-    if (part.indexOf(' ') == -1) {
-      quoted.push(part);
-    } else {
-      quoted.push(this.quote_ + part + this.quote_);
+goog.scope(function () {
+  var CssFontFamilyName = webfont.CssFontFamilyName;
+
+  /**
+   * Quotes the name.
+   * @param {string} name The name to quote.
+   * @return {string} The quoted name.
+   */
+  CssFontFamilyName.prototype.quote = function(name) {
+    var quoted = [];
+    var split = name.split(/,\s*/);
+    for (var i = 0; i < split.length; i++) {
+      var part = split[i].replace(/['"]/g, '');
+      if (part.indexOf(' ') == -1) {
+        quoted.push(part);
+      } else {
+        quoted.push(this.quote_ + part + this.quote_);
+      }
     }
-  }
-  return quoted.join(',');
-};
+    return quoted.join(',');
+  };
+});

data/src/core/domhelper.js

@@ -1,3 +1,5 @@
+goog.provide('webfont.DomHelper');
+
 /**
  * Handles common DOM manipulation tasks. The aim of this library is to cover
  * the needs of typical font loading. Not more, not less.
@@ -17,215 +19,219 @@ webfont.DomHelper = function(mainWindow, opt_loadWindow) {
   this.supportForStyle_ = undefined;
 };
 
-/**
- * Creates an element.
- * @param {string} elem The element type.
- * @param {Object=} opt_attr A hash of attribute key/value pairs.
- * @param {string=} opt_innerHtml Contents of the element.
- * @return {Element} the new element.
- */
-webfont.DomHelper.prototype.createElement = function(elem, opt_attr,
-    opt_innerHtml) {
-  var domElement = this.document_.createElement(elem);
-
-  if (opt_attr) {
-    for (var attr in opt_attr) {
-      // protect against native prototype augmentations
-      if (opt_attr.hasOwnProperty(attr)) {
-        if (attr == "style") {
-          this.setStyle(domElement, opt_attr[attr]);
-        } else {
-          domElement.setAttribute(attr, opt_attr[attr]);
+goog.scope(function () {
+  var DomHelper = webfont.DomHelper;
+
+  /**
+   * Creates an element.
+   * @param {string} elem The element type.
+   * @param {Object=} opt_attr A hash of attribute key/value pairs.
+   * @param {string=} opt_innerHtml Contents of the element.
+   * @return {Element} the new element.
+   */
+  DomHelper.prototype.createElement = function(elem, opt_attr,
+      opt_innerHtml) {
+    var domElement = this.document_.createElement(elem);
+
+    if (opt_attr) {
+      for (var attr in opt_attr) {
+        // protect against native prototype augmentations
+        if (opt_attr.hasOwnProperty(attr)) {
+          if (attr == "style") {
+            this.setStyle(domElement, opt_attr[attr]);
+          } else {
+            domElement.setAttribute(attr, opt_attr[attr]);
+          }
         }
       }
     }
-  }
-  if (opt_innerHtml) {
-    domElement.appendChild(this.document_.createTextNode(opt_innerHtml));
-  }
-  return domElement;
-};
-
-/**
- * Inserts an element into the document. This is intended for unambiguous
- * elements such as html, body, head.
- * @param {string} tagName The element name.
- * @param {Element} e The element to append.
- * @return {boolean} True if the element was inserted.
- */
-webfont.DomHelper.prototype.insertInto = function(tagName, e) {
-  var t = this.document_.getElementsByTagName(tagName)[0];
-
-  if (!t) { // opera allows documents without a head
-    t = document.documentElement;
-  }
-
-  if (t && t.lastChild) {
-    // This is safer than appendChild in IE. appendChild causes random
-    // JS errors in IE. Sometimes errors in other JS exectution, sometimes
-    // complete 'This page cannot be displayed' errors. For our purposes,
-    // it's equivalent because we don't need to insert at any specific
-    // location.
-    t.insertBefore(e, t.lastChild);
-    return true;
-  }
-  return false;
-};
-
-/**
- * Calls a function when the body tag exists.
- * @param {function()} callback The function to call.
- */
-webfont.DomHelper.prototype.whenBodyExists = function(callback) {
-  var check = function() {
-    if (document.body) {
-      callback();
-    } else {
-      setTimeout(check, 0);
+    if (opt_innerHtml) {
+      domElement.appendChild(this.document_.createTextNode(opt_innerHtml));
     }
-  }
-  check();
-};
-
-/**
- * Removes an element from the DOM.
- * @param {Element} node The element to remove.
- * @return {boolean} True if the element was removed.
- */
-webfont.DomHelper.prototype.removeElement = function(node) {
-  if (node.parentNode) {
-    node.parentNode.removeChild(node);
-    return true;
-  }
-  return false;
-};
-
-/**
- * Creates a link to a CSS document.
- * @param {string} src The URL of the stylesheet.
- * @return {Element} a link element.
- */
-webfont.DomHelper.prototype.createCssLink = function(src) {
-  return this.createElement('link', {
-    'rel': 'stylesheet',
-    'href': src
-  });
-};
-
-/**
- * Creates a link to a javascript document.
- * @param {string} src The URL of the script.
- * @return {Element} a script element.
- */
-webfont.DomHelper.prototype.createScriptSrc = function(src) {
-  return this.createElement('script', {
-    'src': src
-  });
-};
-
-/**
- * Appends a name to an element's class attribute.
- * @param {Element} e The element.
- * @param {string} name The class name to add.
- */
-webfont.DomHelper.prototype.appendClassName = function(e, name) {
-  var classes = e.className.split(/\s+/);
-  for (var i = 0, len = classes.length; i < len; i++) {
-    if (classes[i] == name) {
-      return;
+    return domElement;
+  };
+
+  /**
+   * Inserts an element into the document. This is intended for unambiguous
+   * elements such as html, body, head.
+   * @param {string} tagName The element name.
+   * @param {Element} e The element to append.
+   * @return {boolean} True if the element was inserted.
+   */
+  DomHelper.prototype.insertInto = function(tagName, e) {
+    var t = this.document_.getElementsByTagName(tagName)[0];
+
+    if (!t) { // opera allows documents without a head
+      t = document.documentElement;
     }
-  }
-  classes.push(name);
-  e.className = classes.join(' ')
-                  .replace(/\s+/g, ' ')
-                  .replace(/^\s+|\s+$/, '');
-};
 
-/**
- * Removes a name to an element's class attribute.
- * @param {Element} e The element.
- * @param {string} name The class name to remove.
- */
-webfont.DomHelper.prototype.removeClassName = function(e, name) {
-  var classes = e.className.split(/\s+/);
-  var remainingClasses = [];
-  for (var i = 0, len = classes.length; i < len; i++) {
-    if (classes[i] != name) {
-      remainingClasses.push(classes[i]);
+    if (t && t.lastChild) {
+      // This is safer than appendChild in IE. appendChild causes random
+      // JS errors in IE. Sometimes errors in other JS exectution, sometimes
+      // complete 'This page cannot be displayed' errors. For our purposes,
+      // it's equivalent because we don't need to insert at any specific
+      // location.
+      t.insertBefore(e, t.lastChild);
+      return true;
     }
-  }
-  e.className = remainingClasses.join(' ')
-                  .replace(/\s+/g, ' ')
-                  .replace(/^\s+|\s+$/, '');
-};
-
-/**
- * Returns true if an element has a given class name and false otherwise.
- * @param {Element} e The element.
- * @param {string} name The class name to check for.
- * @return {boolean} Whether or not the element has this class name.
- */
-webfont.DomHelper.prototype.hasClassName = function(e, name) {
-  var classes = e.className.split(/\s+/);
-  for (var i = 0, len = classes.length; i < len; i++) {
-    if (classes[i] == name) {
+    return false;
+  };
+
+  /**
+   * Calls a function when the body tag exists.
+   * @param {function()} callback The function to call.
+   */
+  DomHelper.prototype.whenBodyExists = function(callback) {
+    var check = function() {
+      if (document.body) {
+        callback();
+      } else {
+        setTimeout(check, 0);
+      }
+    }
+    check();
+  };
+
+  /**
+   * Removes an element from the DOM.
+   * @param {Element} node The element to remove.
+   * @return {boolean} True if the element was removed.
+   */
+  DomHelper.prototype.removeElement = function(node) {
+    if (node.parentNode) {
+      node.parentNode.removeChild(node);
       return true;
     }
-  }
-  return false;
-};
-
-/**
- * Sets the style attribute on an element.
- * @param {Element} e The element.
- * @param {string} styleString The style string.
- */
-webfont.DomHelper.prototype.setStyle = function(e, styleString) {
-  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_
-};
-
-/**
- * @return {Window} The main window webfontloader.js is loaded in (for config).
- */
-webfont.DomHelper.prototype.getMainWindow = function() {
-  return this.mainWindow_;
-};
-
-/**
- * @return {Window} The window that we're loading the font(s) into.
- */
-webfont.DomHelper.prototype.getLoadWindow = function() {
-  return this.loadWindow_;
-};
-
-/**
- * @return {string} The protocol (http: or https:) to request resources in.
- */
-webfont.DomHelper.prototype.getProtocol = function() {
-  var protocol = this.loadWindow_.location.protocol;
-  // For empty iframes, fallback to main window's protocol.
-  if (protocol == 'about:') {
-    protocol = this.mainWindow_.location.protocol;
-  }
-  return protocol == 'https:' ? 'https:' : 'http:';
-};
+    return false;
+  };
+
+  /**
+   * Creates a link to a CSS document.
+   * @param {string} src The URL of the stylesheet.
+   * @return {Element} a link element.
+   */
+  DomHelper.prototype.createCssLink = function(src) {
+    return this.createElement('link', {
+      'rel': 'stylesheet',
+      'href': src
+    });
+  };
+
+  /**
+   * Creates a link to a javascript document.
+   * @param {string} src The URL of the script.
+   * @return {Element} a script element.
+   */
+  DomHelper.prototype.createScriptSrc = function(src) {
+    return this.createElement('script', {
+      'src': src
+    });
+  };
+
+  /**
+   * Appends a name to an element's class attribute.
+   * @param {Element} e The element.
+   * @param {string} name The class name to add.
+   */
+  DomHelper.prototype.appendClassName = function(e, name) {
+    var classes = e.className.split(/\s+/);
+    for (var i = 0, len = classes.length; i < len; i++) {
+      if (classes[i] == name) {
+        return;
+      }
+    }
+    classes.push(name);
+    e.className = classes.join(' ')
+                    .replace(/\s+/g, ' ')
+                    .replace(/^\s+|\s+$/, '');
+  };
+
+  /**
+   * Removes a name to an element's class attribute.
+   * @param {Element} e The element.
+   * @param {string} name The class name to remove.
+   */
+  DomHelper.prototype.removeClassName = function(e, name) {
+    var classes = e.className.split(/\s+/);
+    var remainingClasses = [];
+    for (var i = 0, len = classes.length; i < len; i++) {
+      if (classes[i] != name) {
+        remainingClasses.push(classes[i]);
+      }
+    }
+    e.className = remainingClasses.join(' ')
+                    .replace(/\s+/g, ' ')
+                    .replace(/^\s+|\s+$/, '');
+  };
+
+  /**
+   * Returns true if an element has a given class name and false otherwise.
+   * @param {Element} e The element.
+   * @param {string} name The class name to check for.
+   * @return {boolean} Whether or not the element has this class name.
+   */
+  DomHelper.prototype.hasClassName = function(e, name) {
+    var classes = e.className.split(/\s+/);
+    for (var i = 0, len = classes.length; i < len; i++) {
+      if (classes[i] == name) {
+        return true;
+      }
+    }
+    return false;
+  };
+
+  /**
+   * Sets the style attribute on an element.
+   * @param {Element} e The element.
+   * @param {string} styleString The style string.
+   */
+  DomHelper.prototype.setStyle = function(e, styleString) {
+    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.
+   */
+  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_
+  };
+
+  /**
+   * @return {Window} The main window webfontloader.js is loaded in (for config).
+   */
+  DomHelper.prototype.getMainWindow = function() {
+    return this.mainWindow_;
+  };
+
+  /**
+   * @return {Window} The window that we're loading the font(s) into.
+   */
+  DomHelper.prototype.getLoadWindow = function() {
+    return this.loadWindow_;
+  };
+
+  /**
+   * @return {string} The protocol (http: or https:) to request resources in.
+   */
+  DomHelper.prototype.getProtocol = function() {
+    var protocol = this.loadWindow_.location.protocol;
+    // For empty iframes, fallback to main window's protocol.
+    if (protocol == 'about:') {
+      protocol = this.mainWindow_.location.protocol;
+    }
+    return protocol == 'https:' ? 'https:' : 'http:';
+  };
+});