webfontloader 1.5.0 → 1.5.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.5.1 (October 15, 2013)
+* Dispatch wf-loading event synchronously instead of waiting for asynchronous modules
+* Update README explaining how to use custom fonts without a stylesheet
+* Add license information to gemspec
+
 v1.5.0 (September 9, 2013)
 * Correctly categorize Internet Explorer 11 as an Internet Explorer version.
 * Add support for custom test strings in the custom module.

data/README.md

@@ -180,6 +180,26 @@ In this example, the `fonts.css` file might look something like this:
       src: ...;
     }
 
+Alternatively, you can load your fonts from a stylesheet not specified in WebFontConfig. As long as the names match those that are declared in the `families` array, the proper loading classes will be applied to the html element.
+
+```
+<script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>
+<script>
+   WebFont.load({
+      custom: {
+         families: ['My Font']
+      }
+   });
+</script>
+
+<style type="text/css">
+   @font-face {
+      font-family:"My Font";
+      src:url("assets/fonts/my_font.woff") format("woff");
+   }
+</style>
+```
+
 The custom module also supports customizing the test strings that are used to determine whether or not a font has loaded. This can be used to load fonts with custom subsets or glyphs in the private use unicode area.
 
     WebFontConfig = {

data/lib/webfontloader.rb

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

data/spec/core/webfont_spec.js

@@ -313,4 +313,55 @@ describe('WebFont', function () {
       });
     });
   });
+
+  describe('synchronous load event', function () {
+    var font = null,
+        testModule = null,
+        inactive = null,
+        loading = null,
+        active = null;
+
+    beforeEach(function () {
+      inactive = jasmine.createSpy('inactive'),
+      active = jasmine.createSpy('active');
+      loading = jasmine.createSpy('loading');
+
+      font = new WebFont(window, fontModuleLoader, userAgent);
+
+      font.addModule('test', function (conf, domHelper) {
+        testModule = new function () {};
+        testModule.supportUserAgent = function (ua, support) {
+          window.setTimeout(function () {
+            support(true);
+          }, 100);
+        };
+        testModule.load = function (onReady) {
+          onReady([]);
+        };
+
+        return testModule;
+      });
+    });
+
+    it('fires loading event correctly', function () {
+      runs(function () {
+        font.load({
+          'test': {},
+          inactive: inactive,
+          active: active,
+          loading: loading
+        });
+        expect(loading).toHaveBeenCalled();
+      });
+
+      waitsFor(function () {
+        return active.wasCalled || inactive.wasCalled;
+      });
+
+      runs(function () {
+        expect(inactive).toHaveBeenCalled();
+        expect(active).not.toHaveBeenCalled();
+      });
+    });
+  });
 });

data/src/core/webfont.js

@@ -66,12 +66,8 @@ goog.scope(function () {
 
       this.moduleFailedLoading_--;
 
-      if (allModulesLoaded) {
-        if (this.moduleFailedLoading_ == 0) {
-          eventDispatcher.dispatchInactive();
-        } else {
-          eventDispatcher.dispatchLoading();
-        }
+      if (allModulesLoaded && this.moduleFailedLoading_ == 0) {
+        eventDispatcher.dispatchInactive();
       }
       fontWatcher.watchFonts([], {}, null, allModulesLoaded);
     }
@@ -87,10 +83,6 @@ goog.scope(function () {
   WebFont.prototype.onModuleReady_ = function(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
     var allModulesLoaded = --this.moduleLoading_ == 0;
 
-    if (allModulesLoaded) {
-      eventDispatcher.dispatchLoading();
-    }
-
     setTimeout(function () {
       fontWatcher.watchFonts(fonts, opt_fontTestStrings || {}, opt_metricCompatibleFonts || null, allModulesLoaded);
     }, 0);
@@ -101,10 +93,16 @@ goog.scope(function () {
    * @param {Object} configuration
    */
   WebFont.prototype.load_ = function(eventDispatcher, configuration) {
-    var modules = this.fontModuleLoader_.getModules(configuration, this.domHelper_),
+    var modules = [],
         timeout = configuration['timeout'],
         self = this;
 
+    // Immediately dispatch the loading event before initializing the modules
+    // so we know for sure that the loading event is synchronous.
+    eventDispatcher.dispatchLoading();
+
+    modules = this.fontModuleLoader_.getModules(configuration, this.domHelper_);
+
     this.moduleFailedLoading_ = this.moduleLoading_ = modules.length;
 
     var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.domHelper_, eventDispatcher, timeout);

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.5.0'
-  s.date              = '2013-09-09'
+  s.version           = '1.5.1'
+  s.date              = '2013-10-15'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -33,6 +33,9 @@ DESC
   s.email    = 'ryan@typekit.com'
   s.homepage = 'http://github.com/typekit/webfontloader'
 
+  ## License
+  s.license = "Apache 2.0"
+
   ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-09 00:00:00 Z
+date: 2013-10-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -204,8 +204,8 @@ files:
 - tools/jasmine/jasmine.js
 - webfontloader.gemspec
 homepage: http://github.com/typekit/webfontloader
-licenses: []
-
+licenses: 
+- Apache 2.0
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8