webfontloader 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b59aa330495e3322b63996a48f290ee2fe85b547
-  data.tar.gz: 21524a08ddfdf3934f59af13e00baac7c1cf8fb1
+  metadata.gz: 31821caf4efeb4ba4f34b805d4fd76b56bb35c4b
+  data.tar.gz: 8e759e2ae26ab7a5ff848244591f574f7642a43c
 SHA512:
-  metadata.gz: a66dffeec358c13ef82ed544966357001bfa400ea7d0d63f67a24df85babc3a4239852e6ec2c9577a65f17f21e1c8bca4f1cb8f14fbac611c9daea621233dca3
-  data.tar.gz: 0cf1f2208bea28c17cc54ebda0ce9bf19b012abf45443f385dc5ff5a5cd8822204fe967d724e195805609ac59d3774f1fc879213cafec00e8d9a653cbac23974
+  metadata.gz: b42346ace09821590399f9de42b038a0c852d0c264fdc20311a2ed7c41ea17af04d7407ddd553f254ebb5c672df52b3de55dd7418ec3003394d423b3f44b1931
+  data.tar.gz: cbfcd9c839eda2b1ebba42514e832bc90d654627c694a9a4bd8fb1e16b1c83471b94aa13553f6a06fa1edade50a9a1b406b724f4a8888a2a87bde021e82351b2

data/CHANGELOG

@@ -1,3 +1,6 @@
+v1.5.6 (September 3, 2014)
+* Fix double inactive event when all modules fail to load
+
 v1.5.5 (June 5, 2014)
 * Add support for the Chromecast browser
 

data/README.md

@@ -155,8 +155,7 @@ Web Font Loader provides a module system so that any web font provider can contr
 ### Custom
 
 To load fonts from any external stylesheet, use the `custom` module. Here you'll
-need to specify both the url of the stylesheet as well as the font families it
-provides.
+need to specify the font family names you're trying to load, and optionally the url of the stylesheet that provides the `@font-face` declarations for those fonts.
 
 You can specify a specific font variation or set of variations to load and watch
 by appending the variations separated by commas to the family name separated by
@@ -198,7 +197,7 @@ In this example, the `fonts.css` file might look something like this:
 }
 ```
 
-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.
+If your fonts are already included in another stylesheet you can also leave out the `urls` array and just specify font family names to start font loading. 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.
 
 ```html
 <script src="//ajax.googleapis.com/ajax/libs/webfont/1.4.7/webfont.js"></script>

data/lib/webfontloader.rb

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

data/spec/core/useragentparser_spec.js

@@ -650,6 +650,25 @@ describe('UserAgentParser', function () {
             hasWebKitMetricsBug: false
           }
         });
+
+        expect(parse('Mozilla/5.0 (Windows Phone 8.1; ARM; Trident/7.0; Touch; rv:11.0; IEMobile/11.0; NOKIA; id404) like Gecko'))
+        .toMatchUserAgent({
+          name: 'MSIE',
+          parsedVersion: new Version(11, 0),
+          version: '11.0',
+          platform: 'Windows Phone',
+          parsedPlatformVersion: new Version(8, 1),
+          platformVersion: '8.1',
+          engine: 'Trident',
+          parsedEngineVersion: new Version(7, 0),
+          engineVersion: '7.0',
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
+          }
+        });
       });
 
       it('should detect unsupported Internet Explorer on Windows Phone', function () {

data/spec/core/webfont_spec.js

@@ -264,6 +264,7 @@ describe('WebFont', function () {
       });
 
       expect(inactive).toHaveBeenCalled();
+      expect(inactive.calls.length).toEqual(1);
     });
   });
 

data/src/core/webfont.js

@@ -68,8 +68,9 @@ goog.scope(function () {
 
       if (allModulesLoaded && this.moduleFailedLoading_ == 0) {
         eventDispatcher.dispatchInactive();
+      } else {
+        fontWatcher.watchFonts([], {}, null, allModulesLoaded);
       }
-      fontWatcher.watchFonts([], {}, null, allModulesLoaded);
     }
   };
 

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.5'
-  s.date              = '2014-06-05'
+  s.version           = '1.5.6'
+  s.date              = '2014-09-03'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webfontloader
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Ryan Carver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake