webfontloader 1.6.11 → 1.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2613d53543cbede96569f20652acc63f6d9f4531
-  data.tar.gz: 0bf80a7cb8ca4af372ea56382af7d5a961631b54
+  metadata.gz: 6faeba41642774e5a27e4723d16cb346f83e0cbd
+  data.tar.gz: a72f21834f3781ee10c9e499f2cfca7ecee11026
 SHA512:
-  metadata.gz: 3e45ba99933335f6bdc4c8cf20c4c97bfd15008e4ee6d0406895b0323e07eae4160c798eb8cac5fda6ecc516ee31e82100a64d3db9579a019c9624e5010176d8
-  data.tar.gz: 2152fe4f24824f3ca42b1fa6a9874fab655c4bdc6e8cf87d43cfcd71562ddcf59030f3fef6a47dfed087b4e18d7f13ce74f7520f7b886707bf66c9a2c129bbab
+  metadata.gz: aea620022efe85c3f3207c1b2b2a7592739abc7d862e009f49abb68f77a05c9fd0de18aba366f2fadfe036d65ea1b27c0e17fa3b17f66b9fcf712bf70de7e949
+  data.tar.gz: fe2a1683b5762f299de149694407af72730d93bcb87c84fd54e52cfe04663733edc88a206d2aa9f26019dccae65cc6ce45d8ddbc08d0591934c5583c909167e1

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.6.12 (November 23, 2015)
+
+* Fix bug that sometimes caused wf-inactive to show when asynchronously loading CSS.
+
 v1.6.11 (November 17, 2015)
 
 * Only include production build in npm package

data/lib/webfontloader.rb

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

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webfontloader",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "description": "Web Font Loader gives you added control when using linked fonts via @font-face.",
   "main": "webfontloader.js",
   "scripts": {

data/src/core/domhelper.js

@@ -338,7 +338,7 @@ goog.scope(function () {
       }, 0);
     }
 
-    function onAvailable(callback) {
+    function onStylesheetAvailable(callback) {
       for (var i = 0; i < sheets.length; i++) {
         if (sheets[i].href && sheets[i].href.indexOf(href) !== -1) {
           return callback();
@@ -346,20 +346,32 @@ goog.scope(function () {
       }
 
       setTimeout(function () {
-        onAvailable(callback);
+        onStylesheetAvailable(callback);
       }, 0);
     }
 
+    function onMediaAvailable(callback) {
+      if (link.sheet && link.sheet.media[0] === "all") {
+        callback();
+      } else {
+        setTimeout(function () {
+          onMediaAvailable(callback);
+        }, 0);
+      }
+    }
+
     this.insertInto('head', link);
 
     if (opt_async) {
-      onAvailable(function () {
+      onStylesheetAvailable(function () {
         link.media = "all";
-        // Give another tick to ensure the @media change takes effect.
-        setTimeout(function() {
+        // The media type change doesn't take effect immediately on Chrome, so
+        // we'll query the media attribute on the stylesheet until it changes
+        // to "all".
+        onMediaAvailable(function () {
           asyncResolved = true;
           mayInvokeCallback();
-        }, 0);
+        });
       });
     }
 

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.6.11'
-  s.date              = '2015-11-17'
+  s.version           = '1.6.12'
+  s.date              = '2015-11-23'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/webfontloader.js

@@ -1,4 +1,4 @@
-/* Web Font Loader v1.6.11 - (c) Adobe Systems, Google. License: Apache 2.0 */
+/* Web Font Loader v1.6.12 - (c) Adobe Systems, Google. License: Apache 2.0 */
 (function(){function aa(a,b,c){return a.call.apply(a.bind,arguments)}function ba(a,b,c){if(!a)throw Error();if(2<arguments.length){var d=Array.prototype.slice.call(arguments,2);return function(){var c=Array.prototype.slice.call(arguments);Array.prototype.unshift.apply(c,d);return a.apply(b,c)}}return function(){return a.apply(b,arguments)}}function n(a,b,c){n=Function.prototype.bind&&-1!=Function.prototype.bind.toString().indexOf("native code")?aa:ba;return n.apply(null,arguments)}var p=Date.now||function(){return+new Date};function q(a,b){this.F=a;this.k=b||a;this.H=this.k.document}var ca=!!window.FontFace;q.prototype.createElement=function(a,b,c){a=this.H.createElement(a);if(b)for(var d in b)b.hasOwnProperty(d)&&("style"==d?a.style.cssText=b[d]:a.setAttribute(d,b[d]));c&&a.appendChild(this.H.createTextNode(c));return a};function s(a,b,c){a=a.H.getElementsByTagName(b)[0];a||(a=document.documentElement);a.insertBefore(c,a.lastChild)}
 function t(a,b,c){b=b||[];c=c||[];for(var d=a.className.split(/\s+/),e=0;e<b.length;e+=1){for(var f=!1,g=0;g<d.length;g+=1)if(b[e]===d[g]){f=!0;break}f||d.push(b[e])}b=[];for(e=0;e<d.length;e+=1){f=!1;for(g=0;g<c.length;g+=1)if(d[e]===c[g]){f=!0;break}f||b.push(d[e])}a.className=b.join(" ").replace(/\s+/g," ").replace(/^\s+|\s+$/,"")}function u(a,b){for(var c=a.className.split(/\s+/),d=0,e=c.length;d<e;d++)if(c[d]==b)return!0;return!1}
 function v(a){if("string"===typeof a.fa)return a.fa;var b=a.k.location.protocol;"about:"==b&&(b=a.F.location.protocol);return"https:"==b?"https:":"http:"}function x(a,b,c){function d(){l&&e&&f&&(l(g),l=null)}b=a.createElement("link",{rel:"stylesheet",href:b,media:"all"});var e=!1,f=!0,g=null,l=c||null;ca?(b.onload=function(){e=!0;d()},b.onerror=function(){e=!0;g=Error("Stylesheet failed to load");d()}):setTimeout(function(){e=!0;d()},0);s(a,"head",b)}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webfontloader
 version: !ruby/object:Gem::Version
-  version: 1.6.11
+  version: 1.6.12
 platform: ruby
 authors:
 - Ryan Carver
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake