src/google/fontapiurlbuilder.js in webfontloader-1.3.0 vs src/google/fontapiurlbuilder.js in webfontloader-1.3.1

@@ -1,5 +1,7 @@
+goog.provide('webfont.FontApiUrlBuilder');
+
 /**
  * @constructor
  */
 webfont.FontApiUrlBuilder = function(apiUrl, protocol, text) {
   if (apiUrl) {
@@ -13,60 +15,63 @@
 };
 
 
 webfont.FontApiUrlBuilder.DEFAULT_API_URL = '//fonts.googleapis.com/css';
 
+goog.scope(function () {
+  var FontApiUrlBuilder = webfont.FontApiUrlBuilder;
 
-webfont.FontApiUrlBuilder.prototype.setFontFamilies = function(fontFamilies) {
-  this.parseFontFamilies_(fontFamilies);
-};
+  FontApiUrlBuilder.prototype.setFontFamilies = function(fontFamilies) {
+    this.parseFontFamilies_(fontFamilies);
+  };
 
 
-webfont.FontApiUrlBuilder.prototype.parseFontFamilies_ =
-    function(fontFamilies) {
-  var length = fontFamilies.length;
+  FontApiUrlBuilder.prototype.parseFontFamilies_ =
+      function(fontFamilies) {
+    var length = fontFamilies.length;
 
-  for (var i = 0; i < length; i++) {
-    var elements = fontFamilies[i].split(':');
+    for (var i = 0; i < length; i++) {
+      var elements = fontFamilies[i].split(':');
 
-    if (elements.length == 3) {
-      this.subsets_.push(elements.pop());
+      if (elements.length == 3) {
+        this.subsets_.push(elements.pop());
+      }
+      var joinCharacter = '';
+      if (elements.length == 2 && elements[1] != ''){
+        joinCharacter = ':';
+      }
+      this.fontFamilies_.push(elements.join(joinCharacter));
     }
-    var joinCharacter = '';
-    if (elements.length == 2 && elements[1] != ''){
-      joinCharacter = ':';
-    }
-    this.fontFamilies_.push(elements.join(joinCharacter));
-  }
-};
+  };
 
 
-webfont.FontApiUrlBuilder.prototype.webSafe = function(string) {
-  return string.replace(/ /g, '+');
-};
+  FontApiUrlBuilder.prototype.webSafe = function(string) {
+    return string.replace(/ /g, '+');
+  };
 
 
-webfont.FontApiUrlBuilder.prototype.build = function() {
-  if (this.fontFamilies_.length == 0) {
-    throw new Error('No fonts to load !');
-  }
-  if (this.apiUrl_.indexOf("kit=") != -1) {
-    return this.apiUrl_;
-  }
-  var length = this.fontFamilies_.length;
-  var sb = [];
+  FontApiUrlBuilder.prototype.build = function() {
+    if (this.fontFamilies_.length == 0) {
+      throw new Error('No fonts to load !');
+    }
+    if (this.apiUrl_.indexOf("kit=") != -1) {
+      return this.apiUrl_;
+    }
+    var length = this.fontFamilies_.length;
+    var sb = [];
 
-  for (var i = 0; i < length; i++) {
-    sb.push(this.webSafe(this.fontFamilies_[i]));
-  }
-  var url = this.apiUrl_ + '?family=' + sb.join('%7C'); // '|' escaped.
+    for (var i = 0; i < length; i++) {
+      sb.push(this.webSafe(this.fontFamilies_[i]));
+    }
+    var url = this.apiUrl_ + '?family=' + sb.join('%7C'); // '|' escaped.
 
-  if (this.subsets_.length > 0) {
-    url += '&subset=' + this.subsets_.join(',');
-  }
+    if (this.subsets_.length > 0) {
+      url += '&subset=' + this.subsets_.join(',');
+    }
 
-  if (this.text_.length > 0) {
-    url += '&text=' + encodeURIComponent(this.text_);
-  }
+    if (this.text_.length > 0) {
+      url += '&text=' + encodeURIComponent(this.text_);
+    }
 
-  return url;
-};
+    return url;
+  };
+});