Skip to content

Commit efe5178

Browse files
zachleatzachleat
committed
Fixes some errors on the demos via https://twitter.com/xwoody/status/758207860866187264 
1 parent 171eae8 commit efe5178

5 files changed

Lines changed: 50 additions & 15 deletions

File tree

‎web-fonts/demos/critical-foft-data-uri.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,16 @@
8686
document.documentElement.className += " fonts-stage-1";
8787

8888
var fontA = new FontFaceObserver('Lato');
89-
var fontB = new FontFaceObserver('LatoBold');
90-
var fontC = new FontFaceObserver('LatoItalic');
91-
var fontD = new FontFaceObserver('LatoBoldItalic');
89+
var fontB = new FontFaceObserver('LatoBold', {
90+
weight: 700
91+
});
92+
var fontC = new FontFaceObserver('LatoItalic', {
93+
style: 'italic'
94+
});
95+
var fontD = new FontFaceObserver('LatoBoldItalic', {
96+
weight: 700,
97+
style: 'italic'
98+
});
9299

93100
Promise.all([fontA.load(), fontB.load(), fontC.load(), fontD.load()]).then(function () {
94101
document.documentElement.className += " fonts-stage-2";

‎web-fonts/demos/critical-foft-preload.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,16 @@
8888
document.documentElement.className += " fonts-stage-1";
8989

9090
var fontA = new FontFaceObserver('Lato');
91-
var fontB = new FontFaceObserver('LatoBold');
92-
var fontC = new FontFaceObserver('LatoItalic');
93-
var fontD = new FontFaceObserver('LatoBoldItalic');
91+
var fontB = new FontFaceObserver('LatoBold', {
92+
weight: 700
93+
});
94+
var fontC = new FontFaceObserver('LatoItalic', {
95+
style: 'italic'
96+
});
97+
var fontD = new FontFaceObserver('LatoBoldItalic', {
98+
weight: 700,
99+
style: 'italic'
100+
});
94101

95102
Promise.all([fontA.load(), fontB.load(), fontC.load(), fontD.load()]).then(function () {
96103
document.documentElement.className += " fonts-stage-2";

‎web-fonts/demos/critical-foft.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,16 @@
8787
document.documentElement.className += " fonts-stage-1";
8888

8989
var fontA = new FontFaceObserver('Lato');
90-
var fontB = new FontFaceObserver('LatoBold');
91-
var fontC = new FontFaceObserver('LatoItalic');
92-
var fontD = new FontFaceObserver('LatoBoldItalic');
90+
var fontB = new FontFaceObserver('LatoBold', {
91+
weight: 700
92+
});
93+
var fontC = new FontFaceObserver('LatoItalic', {
94+
style: 'italic'
95+
});
96+
var fontD = new FontFaceObserver('LatoBoldItalic', {
97+
weight: 700,
98+
style: 'italic'
99+
});
93100

94101
Promise.all([fontA.load(), fontB.load(), fontC.load(), fontD.load()]).then(function () {
95102
document.documentElement.className += " fonts-stage-2";

‎web-fonts/demos/foft.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,16 @@
7575
Promise.all([fontA.load()]).then(function () {
7676
document.documentElement.className += " fonts-stage-1";
7777

78-
var fontB = new FontFaceObserver('LatoBold');
79-
var fontC = new FontFaceObserver('LatoItalic');
80-
var fontD = new FontFaceObserver('LatoBoldItalic');
78+
var fontB = new FontFaceObserver('LatoBold', {
79+
weight: 700
80+
});
81+
var fontC = new FontFaceObserver('LatoItalic', {
82+
style: 'italic'
83+
});
84+
var fontD = new FontFaceObserver('LatoBoldItalic', {
85+
weight: 700,
86+
style: 'italic'
87+
});
8188

8289
Promise.all([fontB.load(), fontC.load(), fontD.load()]).then(function () {
8390
document.documentElement.className += " fonts-stage-2";

‎web-fonts/demos/fout-with-class.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,16 @@
7171
(function(){function e(e,t){document.addEventListener?e.addEventListener("scroll",t,!1):e.attachEvent("scroll",t)}function t(e){document.body?e():document.addEventListener?document.addEventListener("DOMContentLoaded",function t(){document.removeEventListener("DOMContentLoaded",t),e()}):document.attachEvent("onreadystatechange",function n(){if("interactive"==document.readyState||"complete"==document.readyState)document.detachEvent("onreadystatechange",n),e()})}function n(e){this.a=document.createElement("div"),this.a.setAttribute("aria-hidden","true"),this.a.appendChild(document.createTextNode(e)),this.b=document.createElement("span"),this.c=document.createElement("span"),this.h=document.createElement("span"),this.f=document.createElement("span"),this.g=-1,this.b.style.cssText="max-width:none;display:inline-block;position:absolute;height:100%;width:100%;overflow:scroll;font-size:16px;",this.c.style.cssText="max-width:none;display:inline-block;position:absolute;height:100%;width:100%;overflow:scroll;font-size:16px;",this.f.style.cssText="max-width:none;display:inline-block;position:absolute;height:100%;width:100%;overflow:scroll;font-size:16px;",this.h.style.cssText="display:inline-block;width:200%;height:200%;font-size:16px;max-width:none;",this.b.appendChild(this.h),this.c.appendChild(this.f),this.a.appendChild(this.b),this.a.appendChild(this.c)}function r(e,t){e.a.style.cssText="max-width:none;min-width:20px;min-height:20px;display:inline-block;overflow:hidden;position:absolute;width:auto;margin:0;padding:0;top:-999px;left:-999px;white-space:nowrap;font:"+t+";"}function i(e){var t=e.a.offsetWidth,n=t+100;return e.f.style.width=n+"px",e.c.scrollLeft=n,e.b.scrollLeft=e.b.scrollWidth+100,e.g!==t?(e.g=t,!0):!1}function s(t,n){function r(){var e=s;i(e)&&null!==e.a.parentNode&&n(e.g)}var s=t;e(t.b,r),e(t.c,r),i(t)}function o(e,t){var n=t||{};this.family=e,this.style=n.style||"normal",this.weight=n.weight||"normal",this.stretch=n.stretch||"normal"}function l(){if(null===a){var e=document.createElement("div");try{e.style.font="condensed 100px sans-serif"}catch(t){}a=""!==e.style.font}return a}function c(e,t){return[e.style,e.weight,l()?e.stretch:"","100px",t].join(" ")}var u=null,a=null,f=null;o.prototype.load=function(e,i){var o=this,a=e||"BESbswy",l=i||3e3,h=(new Date).getTime();return new Promise(function(e,i){null===f&&(f=!!window.FontFace);if(f){var p=new Promise(function(e,t){function n(){(new Date).getTime()-h>=l?t():document.fonts.load(c(o,o.family),a).then(function(t){1<=t.length?e():setTimeout(n,25)},function(){t()})}n()}),d=new Promise(function(e,t){setTimeout(t,l)});Promise.race([d,p]).then(function(){e(o)},function(){i(o)})}else t(function(){function t(){var t;if(t=-1!=m&&-1!=g||-1!=m&&-1!=S||-1!=g&&-1!=S)(t=m!=g&&m!=S&&g!=S)||(null===u&&(t=/AppleWebKit\/([0-9]+)(?:\.([0-9]+))/.exec(window.navigator.userAgent),u=!!t&&(536>parseInt(t[1],10)||536===parseInt(t[1],10)&&11>=parseInt(t[2],10))),t=u&&(m==x&&g==x&&S==x||m==T&&g==T&&S==T||m==N&&g==N&&S==N)),t=!t;t&&(null!==C.parentNode&&C.parentNode.removeChild(C),clearTimeout(L),e(o))}function f(){if((new Date).getTime()-h>=l)null!==C.parentNode&&C.parentNode.removeChild(C),i(o);else{var e=document.hidden;if(!0===e||void 0===e)m=p.a.offsetWidth,g=d.a.offsetWidth,S=v.a.offsetWidth,t();L=setTimeout(f,50)}}var p=new n(a),d=new n(a),v=new n(a),m=-1,g=-1,S=-1,x=-1,T=-1,N=-1,C=document.createElement("div"),L=0;C.dir="ltr",r(p,c(o,"sans-serif")),r(d,c(o,"serif")),r(v,c(o,"monospace")),C.appendChild(p.a),C.appendChild(d.a),C.appendChild(v.a),document.body.appendChild(C),x=p.a.offsetWidth,T=d.a.offsetWidth,N=v.a.offsetWidth,f(),s(p,function(e){m=e,t()}),r(p,c(o,'"'+o.family+'",sans-serif')),s(d,function(e){g=e,t()}),r(d,c(o,'"'+o.family+'",serif')),s(v,function(e){S=e,t()}),r(v,c(o,'"'+o.family+'",monospace'))})})},"undefined"!=typeof module?module.exports=o:(window.FontFaceObserver=o,window.FontFaceObserver.prototype.load=o.prototype.load)})();
7272

7373
var fontA = new FontFaceObserver('Lato');
74-
var fontB = new FontFaceObserver('LatoBold');
75-
var fontC = new FontFaceObserver('LatoItalic');
76-
var fontD = new FontFaceObserver('LatoBoldItalic');
74+
var fontB = new FontFaceObserver('LatoBold', {
75+
weight: 700
76+
});
77+
var fontC = new FontFaceObserver('LatoItalic', {
78+
style: 'italic'
79+
});
80+
var fontD = new FontFaceObserver('LatoBoldItalic', {
81+
weight: 700,
82+
style: 'italic'
83+
});
7784

7885
Promise.all([fontA.load(), fontB.load(), fontC.load(), fontD.load()]).then(function () {
7986
document.documentElement.className += " fonts-loaded";

0 commit comments

Comments
 (0)