webfontloader 1.4.4 → 1.4.5

data/src/{google → modules/google}/fontapiparser.js

@@ -1,18 +1,18 @@
-goog.provide('webfont.FontApiParser');
+goog.provide('webfont.modules.google.FontApiParser');
 
 goog.require('webfont.Font');
 
 /**
  * @constructor
  */
-webfont.FontApiParser = function(fontFamilies) {
+webfont.modules.google.FontApiParser = function(fontFamilies) {
   this.fontFamilies_ = fontFamilies;
   this.parsedFonts_ = [];
   this.fontTestStrings_ = {};
 };
 
 
-webfont.FontApiParser.INT_FONTS = {
+webfont.modules.google.FontApiParser.INT_FONTS = {
   'latin': webfont.FontWatchRunner.DEFAULT_TEST_STRING,
   'cyrillic': 'йяЖ',
   'greek': 'αβΣ',
@@ -20,7 +20,7 @@ webfont.FontApiParser.INT_FONTS = {
   'Hanuman': 'កខគ' // For backward compatibility
 };
 
-webfont.FontApiParser.WEIGHTS = {
+webfont.modules.google.FontApiParser.WEIGHTS = {
   'thin': '1',
   'extralight': '2',
   'extra-light': '2',
@@ -46,20 +46,20 @@ webfont.FontApiParser.WEIGHTS = {
   'b': '7'
 };
 
-webfont.FontApiParser.STYLES = {
+webfont.modules.google.FontApiParser.STYLES = {
   'i': 'i',
   'italic': 'i',
   'n': 'n',
   'normal': 'n'
 };
 
-webfont.FontApiParser.VARIATION_MATCH =
+webfont.modules.google.FontApiParser.VARIATION_MATCH =
     new RegExp("^(thin|(?:(?:extra|ultra)-?)?light|regular|book|medium|" +
         "(?:(?:semi|demi|extra|ultra)-?)?bold|black|heavy|l|r|b|[1-9]00)?(n|i" +
         "|normal|italic)?$");
 
 goog.scope(function () {
-  var FontApiParser = webfont.FontApiParser,
+  var FontApiParser = webfont.modules.google.FontApiParser,
       Font = webfont.Font;
 
   FontApiParser.prototype.parse = function() {

data/src/{google → modules/google}/fontapiurlbuilder.js

@@ -1,13 +1,13 @@
-goog.provide('webfont.FontApiUrlBuilder');
+goog.provide('webfont.modules.google.FontApiUrlBuilder');
 
 /**
  * @constructor
  */
-webfont.FontApiUrlBuilder = function(apiUrl, protocol, text) {
+webfont.modules.google.FontApiUrlBuilder = function(apiUrl, protocol, text) {
   if (apiUrl) {
     this.apiUrl_ = apiUrl;
   } else {
-    this.apiUrl_ = protocol + webfont.FontApiUrlBuilder.DEFAULT_API_URL;
+    this.apiUrl_ = protocol + webfont.modules.google.FontApiUrlBuilder.DEFAULT_API_URL;
   }
   this.fontFamilies_ = [];
   this.subsets_ = [];
@@ -15,10 +15,10 @@ webfont.FontApiUrlBuilder = function(apiUrl, protocol, text) {
 };
 
 
-webfont.FontApiUrlBuilder.DEFAULT_API_URL = '//fonts.googleapis.com/css';
+webfont.modules.google.FontApiUrlBuilder.DEFAULT_API_URL = '//fonts.googleapis.com/css';
 
 goog.scope(function () {
-  var FontApiUrlBuilder = webfont.FontApiUrlBuilder;
+  var FontApiUrlBuilder = webfont.modules.google.FontApiUrlBuilder;
 
   FontApiUrlBuilder.prototype.setFontFamilies = function(fontFamilies) {
     this.parseFontFamilies_(fontFamilies);

data/src/{google → modules/google}/googlefontapi.js

@@ -1,28 +1,28 @@
-goog.provide('webfont.GoogleFontApi');
+goog.provide('webfont.modules.google.GoogleFontApi');
 
-goog.require('webfont.FontApiUrlBuilder');
-goog.require('webfont.FontApiParser');
+goog.require('webfont.modules.google.FontApiUrlBuilder');
+goog.require('webfont.modules.google.FontApiParser');
 goog.require('webfont.FontWatchRunner');
-goog.require('webfont.LastResortWebKitFontWatchRunner');
+goog.require('webfont.modules.google.LastResortWebKitFontWatchRunner');
 
 /**
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.GoogleFontApi = function(userAgent, domHelper, configuration) {
+webfont.modules.google.GoogleFontApi = function(userAgent, domHelper, configuration) {
   this.userAgent_ = userAgent;
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
 };
 
-webfont.GoogleFontApi.NAME = 'google';
+webfont.modules.google.GoogleFontApi.NAME = 'google';
 
 goog.scope(function () {
-  var GoogleFontApi = webfont.GoogleFontApi,
+  var GoogleFontApi = webfont.modules.google.GoogleFontApi,
       FontWatchRunner = webfont.FontWatchRunner,
-      LastResortWebKitFontWatchRunner = webfont.LastResortWebKitFontWatchRunner,
-      FontApiUrlBuilder = webfont.FontApiUrlBuilder,
-      FontApiParser = webfont.FontApiParser;
+      LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
+      FontApiUrlBuilder = webfont.modules.google.FontApiUrlBuilder,
+      FontApiParser = webfont.modules.google.FontApiParser;
 
   GoogleFontApi.prototype.supportUserAgent = function(userAgent, support) {
     support(userAgent.getBrowserInfo().hasWebFontSupport());
@@ -63,8 +63,8 @@ goog.scope(function () {
   };
 });
 
-globalNamespaceObject.addModule(webfont.GoogleFontApi.NAME, function(configuration, domHelper) {
+globalNamespaceObject.addModule(webfont.modules.google.GoogleFontApi.NAME, function(configuration, domHelper) {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
-  return new webfont.GoogleFontApi(userAgent, domHelper, configuration);
+  return new webfont.modules.google.GoogleFontApi(userAgent, domHelper, configuration);
 });

data/src/{google → modules/google}/lastresortwebkitfontwatchrunner.js

@@ -1,4 +1,4 @@
-goog.provide('webfont.LastResortWebKitFontWatchRunner');
+goog.provide('webfont.modules.google.LastResortWebKitFontWatchRunner');
 
 goog.require('webfont.Font');
 goog.require('webfont.FontRuler');
@@ -15,7 +15,7 @@ goog.require('webfont.FontRuler');
  * @param {string=} opt_fontTestString
  * @extends webfont.FontWatchRunner
  */
-webfont.LastResortWebKitFontWatchRunner = function(activeCallback,
+webfont.modules.google.LastResortWebKitFontWatchRunner = function(activeCallback,
     inactiveCallback, domHelper, font,
     browserInfo, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
 
@@ -28,16 +28,16 @@ webfont.LastResortWebKitFontWatchRunner = function(activeCallback,
   this.lastObservedWidthB_ = this.lastResortWidths_[webfont.FontWatchRunner.LastResortFonts.SANS_SERIF];;
 };
 
-goog.inherits(webfont.LastResortWebKitFontWatchRunner, webfont.FontWatchRunner)
+goog.inherits(webfont.modules.google.LastResortWebKitFontWatchRunner, webfont.FontWatchRunner)
 
-webfont.LastResortWebKitFontWatchRunner.METRICS_COMPATIBLE_FONTS = {
+webfont.modules.google.LastResortWebKitFontWatchRunner.METRICS_COMPATIBLE_FONTS = {
     "Arimo": true,
     "Cousine": true,
     "Tinos": true
 };
 
 goog.scope(function () {
-  var LastResortWebKitFontWatchRunner = webfont.LastResortWebKitFontWatchRunner,
+  var LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
       Font = webfont.Font,
       FontRuler = webfont.FontRuler;
 

data/src/{monotype/monotype_script.js → modules/monotype.js}

@@ -1,4 +1,4 @@
-goog.provide('webfont.MonotypeScript');
+goog.provide('webfont.modules.Monotype');
 
 goog.require('webfont.Font');
 
@@ -14,7 +14,7 @@ projectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'//this is your Fonts.com Web fo
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.MonotypeScript = function (userAgent, domHelper, configuration) {
+webfont.modules.Monotype = function (userAgent, domHelper, configuration) {
   this.userAgent_ = userAgent;
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
@@ -25,38 +25,38 @@ webfont.MonotypeScript = function (userAgent, domHelper, configuration) {
  * name of the module through which external API is supposed to call the MonotypeFontAPI.
  * @const
  */
-webfont.MonotypeScript.NAME = 'monotype';
+webfont.modules.Monotype.NAME = 'monotype';
 
 /**
  * __mti_fntLst is the name of function that exposes Monotype's font list.
  * @const
  */
-webfont.MonotypeScript.HOOK = '__mti_fntLst';
+webfont.modules.Monotype.HOOK = '__mti_fntLst';
 
 /**
  * __MonotypeAPIScript__ is the id of script added by google API. Currently 'webfonts.fonts.com' supports only one script in a page.
  * This may require change in future if 'webfonts.fonts.com' begins supporting multiple scripts per page.
  * @const
  */
-webfont.MonotypeScript.SCRIPTID = '__MonotypeAPIScript__';
+webfont.modules.Monotype.SCRIPTID = '__MonotypeAPIScript__';
 
 goog.scope(function () {
-  var MonotypeScript = webfont.MonotypeScript,
+  var Monotype = webfont.modules.Monotype,
       Font = webfont.Font;
 
-  MonotypeScript.prototype.supportUserAgent = function (userAgent, support) {
+  Monotype.prototype.supportUserAgent = function (userAgent, support) {
     var self = this;
     var projectId = self.configuration_['projectId'];
     var version = self.configuration_['version'];
     if (projectId) {
-      var sc = self.domHelper_.createElement("script");
-      sc["id"] = MonotypeScript.SCRIPTID + projectId;
+      var loadWindow = self.domHelper_.getLoadWindow(),
+          sc = self.domHelper_.createElement("script");
 
-      var loadWindow = this.domHelper_.getLoadWindow();
+      sc["id"] = Monotype.SCRIPTID + projectId;
 
       function onload() {
-        if (loadWindow[MonotypeScript.HOOK + projectId]) {
-          var mti_fnts = loadWindow[webfont.MonotypeScript.HOOK + projectId]();
+        if (loadWindow[Monotype.HOOK + projectId]) {
+          var mti_fnts = loadWindow[Monotype.HOOK + projectId]();
           if (mti_fnts) {
             for (var i = 0; i < mti_fnts.length; i++) {
               self.fonts_.push(new Font(mti_fnts[i]["fontfamily"]));
@@ -84,19 +84,19 @@ goog.scope(function () {
     }
   };
 
-  MonotypeScript.prototype.getScriptSrc = function (projectId, version) {
+  Monotype.prototype.getScriptSrc = function (projectId, version) {
     var p = this.domHelper_.getProtocol();
     var api = (this.configuration_['api'] || 'fast.fonts.com/jsapi').replace(/^.*http(s?):(\/\/)?/, "");
     return p + "//" + api + '/' + projectId + '.js' + ( version ? '?v='+ version : '' );
   };
 
-  MonotypeScript.prototype.load = function (onReady) {
+  Monotype.prototype.load = function (onReady) {
     onReady(this.fonts_);
   };
 });
 
-globalNamespaceObject.addModule(webfont.MonotypeScript.NAME, function (configuration, domHelper) {
+globalNamespaceObject.addModule(webfont.modules.Monotype.NAME, function (configuration, domHelper) {
   var userAgentParser = new webfont.UserAgentParser(navigator.userAgent, document);
   var userAgent = userAgentParser.parse();
-  return new webfont.MonotypeScript(userAgent, domHelper, configuration);
+  return new webfont.modules.Monotype(userAgent, domHelper, configuration);
 });

data/src/{typekit/typekit_script.js → modules/typekit.js}

@@ -1,4 +1,4 @@
-goog.provide('webfont.TypekitScript');
+goog.provide('webfont.modules.Typekit');
 
 goog.require('webfont.Font');
 
@@ -6,26 +6,26 @@ goog.require('webfont.Font');
  * @constructor
  * @implements {webfont.FontModule}
  */
-webfont.TypekitScript = function(domHelper, configuration) {
+webfont.modules.Typekit = function(domHelper, configuration) {
   this.domHelper_ = domHelper;
   this.configuration_ = configuration;
   this.fonts_ = [];
 };
 
-webfont.TypekitScript.NAME = 'typekit';
-webfont.TypekitScript.HOOK = '__webfonttypekitmodule__';
+webfont.modules.Typekit.NAME = 'typekit';
+webfont.modules.Typekit.HOOK = '__webfonttypekitmodule__';
 
 goog.scope(function () {
-  var TypekitScript = webfont.TypekitScript,
+  var Typekit = webfont.modules.Typekit,
       Font = webfont.Font;
 
-  TypekitScript.prototype.getScriptSrc = function(kitId) {
+  Typekit.prototype.getScriptSrc = function(kitId) {
     var protocol = this.domHelper_.getProtocol();
     var api = this.configuration_['api'] || protocol + '//use.typekit.net';
     return api + '/' + kitId + '.js';
   };
 
-  TypekitScript.prototype.supportUserAgent = function(userAgent, support) {
+  Typekit.prototype.supportUserAgent = function(userAgent, support) {
     var kitId = this.configuration_['id'];
     var configuration = this.configuration_;
     var loadWindow = this.domHelper_.getLoadWindow();
@@ -33,13 +33,13 @@ goog.scope(function () {
 
     if (kitId) {
       // Provide data to Typekit for processing.main
-      if (!loadWindow[webfont.TypekitScript.HOOK]) {
-        loadWindow[webfont.TypekitScript.HOOK] = {};
+      if (!loadWindow[Typekit.HOOK]) {
+        loadWindow[Typekit.HOOK] = {};
       }
 
       // Typekit will call 'init' to indicate whether it supports fonts
       // and what fonts will be provided.
-      loadWindow[webfont.TypekitScript.HOOK][kitId] = function(callback) {
+      loadWindow[Typekit.HOOK][kitId] = function(callback) {
         var init = function(typekitSupports, fontFamilies, fontVariations) {
           for (var i = 0; i < fontFamilies.length; i += 1) {
             var variations = fontVariations[fontFamilies[i]];
@@ -65,11 +65,11 @@ goog.scope(function () {
     }
   };
 
-  TypekitScript.prototype.load = function(onReady) {
+  Typekit.prototype.load = function(onReady) {
     onReady(this.fonts_);
   };
 });
 
-globalNamespaceObject.addModule(webfont.TypekitScript.NAME, function(configuration, domHelper) {
-  return new webfont.TypekitScript(domHelper, configuration);
+globalNamespaceObject.addModule(webfont.modules.Typekit.NAME, function(configuration, domHelper) {
+  return new webfont.modules.Typekit(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.4.4'
-  s.date              = '2013-05-22'
+  s.version           = '1.4.5'
+  s.date              = '2013-05-23'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -106,10 +106,10 @@ DESC
     lib/webfontloader/demo/public/typekit.html
     lib/webfontloader/demo/server.rb
     lib/webfontloader/modules.rb
-    spec/ascender/ascenderscript_spec.js
     spec/core/cssclassname_spec.js
     spec/core/domhelper_spec.js
     spec/core/eventdispatcher_spec.js
+    spec/core/external_script.js
     spec/core/font_spec.js
     spec/core/fontmoduleloader_spec.js
     spec/core/fontruler_spec.js
@@ -119,9 +119,7 @@ DESC
     spec/core/useragentparser_spec.js
     spec/core/version_spec.js
     spec/core/webfont_spec.js
-    spec/custom/customcss_spec.js
     spec/deps.js
-    spec/fontdeck/fontdeckscript_spec.js
     spec/fonts/LICENSE.txt
     spec/fonts/nullfont.css
     spec/fonts/nullfont1.css
@@ -137,14 +135,16 @@ DESC
     spec/fonts/sourcesansc.css
     spec/fonts/sourcesanscbold.css
     spec/fonts/sourcesanscbold.otf
-    spec/google/fontapiparser_spec.js
-    spec/google/fontapiurlbuilder_spec.js
-    spec/google/googlefontapi_spec.js
-    spec/google/lastresortwebkitfontwatchrunner_spec.js
     spec/index.html
-    spec/monotype/monotypescript_spec.js
-    spec/typekit/typekitscript_spec.js
-    src/ascender/ascender_script.js
+    spec/modules/ascender_spec.js
+    spec/modules/custom_spec.js
+    spec/modules/fontdeck_spec.js
+    spec/modules/google/fontapiparser_spec.js
+    spec/modules/google/fontapiurlbuilder_spec.js
+    spec/modules/google/googlefontapi_spec.js
+    spec/modules/google/lastresortwebkitfontwatchrunner_spec.js
+    spec/modules/monotype_spec.js
+    spec/modules/typekit_spec.js
     src/async_load.js
     src/closure.js
     src/core/browserinfo.js
@@ -162,15 +162,16 @@ DESC
     src/core/useragentparser.js
     src/core/version.js
     src/core/webfont.js
-    src/custom/customcss.js
-    src/fontdeck/fontdeck_script.js
-    src/google/fontapiparser.js
-    src/google/fontapiurlbuilder.js
-    src/google/googlefontapi.js
-    src/google/lastresortwebkitfontwatchrunner.js
     src/modules.yml
-    src/monotype/monotype_script.js
-    src/typekit/typekit_script.js
+    src/modules/ascender.js
+    src/modules/custom.js
+    src/modules/fontdeck.js
+    src/modules/google/fontapiparser.js
+    src/modules/google/fontapiurlbuilder.js
+    src/modules/google/googlefontapi.js
+    src/modules/google/lastresortwebkitfontwatchrunner.js
+    src/modules/monotype.js
+    src/modules/typekit.js
     tools/compiler/base.js
     tools/compiler/compiler.jar
     tools/jasmine-phantomjs/jasmine-phantomjs.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 4
-  - 4
-  version: 1.4.4
+  - 5
+  version: 1.4.5
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-22 00:00:00 Z
+date: 2013-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -134,10 +134,10 @@ files:
 - lib/webfontloader/demo/public/typekit.html
 - lib/webfontloader/demo/server.rb
 - lib/webfontloader/modules.rb
-- spec/ascender/ascenderscript_spec.js
 - spec/core/cssclassname_spec.js
 - spec/core/domhelper_spec.js
 - spec/core/eventdispatcher_spec.js
+- spec/core/external_script.js
 - spec/core/font_spec.js
 - spec/core/fontmoduleloader_spec.js
 - spec/core/fontruler_spec.js
@@ -147,9 +147,7 @@ files:
 - spec/core/useragentparser_spec.js
 - spec/core/version_spec.js
 - spec/core/webfont_spec.js
-- spec/custom/customcss_spec.js
 - spec/deps.js
-- spec/fontdeck/fontdeckscript_spec.js
 - spec/fonts/LICENSE.txt
 - spec/fonts/nullfont.css
 - spec/fonts/nullfont1.css
@@ -165,14 +163,16 @@ files:
 - spec/fonts/sourcesansc.css
 - spec/fonts/sourcesanscbold.css
 - spec/fonts/sourcesanscbold.otf
-- spec/google/fontapiparser_spec.js
-- spec/google/fontapiurlbuilder_spec.js
-- spec/google/googlefontapi_spec.js
-- spec/google/lastresortwebkitfontwatchrunner_spec.js
 - spec/index.html
-- spec/monotype/monotypescript_spec.js
-- spec/typekit/typekitscript_spec.js
-- src/ascender/ascender_script.js
+- spec/modules/ascender_spec.js
+- spec/modules/custom_spec.js
+- spec/modules/fontdeck_spec.js
+- spec/modules/google/fontapiparser_spec.js
+- spec/modules/google/fontapiurlbuilder_spec.js
+- spec/modules/google/googlefontapi_spec.js
+- spec/modules/google/lastresortwebkitfontwatchrunner_spec.js
+- spec/modules/monotype_spec.js
+- spec/modules/typekit_spec.js
 - src/async_load.js
 - src/closure.js
 - src/core/browserinfo.js
@@ -190,15 +190,16 @@ files:
 - src/core/useragentparser.js
 - src/core/version.js
 - src/core/webfont.js
-- src/custom/customcss.js
-- src/fontdeck/fontdeck_script.js
-- src/google/fontapiparser.js
-- src/google/fontapiurlbuilder.js
-- src/google/googlefontapi.js
-- src/google/lastresortwebkitfontwatchrunner.js
 - src/modules.yml
-- src/monotype/monotype_script.js
-- src/typekit/typekit_script.js
+- src/modules/ascender.js
+- src/modules/custom.js
+- src/modules/fontdeck.js
+- src/modules/google/fontapiparser.js
+- src/modules/google/fontapiurlbuilder.js
+- src/modules/google/googlefontapi.js
+- src/modules/google/lastresortwebkitfontwatchrunner.js
+- src/modules/monotype.js
+- src/modules/typekit.js
 - tools/compiler/base.js
 - tools/compiler/compiler.jar
 - tools/jasmine-phantomjs/jasmine-phantomjs.js