Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
Merge 9f8027f into 0e8f6a2
Browse files Browse the repository at this point in the history
  • Loading branch information
darkwing committed Jun 25, 2015
2 parents 0e8f6a2 + 9f8027f commit aff4686
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions media/js/fonts.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
// what fonts are we loading?
var fonts = [
{
"name" : "Open Sans Light",
"class" : "ffo-opensanslight",
"varient" : [
{"weight" : "normal"},
{"weight" : "bold"},
{"style" : "italic"}
'name' : 'Open Sans Light',
'class' : 'ffo-opensanslight',
'varient' : [
{'weight' : 'normal'},
{'weight' : 'bold'},
{'style' : 'italic'}
]
},
{
"name" : "Open Sans",
"class" : "ffo-opensans",
"varient" : [
{"weight" : "normal"},
{"weight" : "bold"},
{"style" : "italic"}
'name' : 'Open Sans',
'class' : 'ffo-opensans',
'varient' : [
{'weight' : 'normal'},
{'weight' : 'bold'},
{'style' : 'italic'}
]
}
];
Expand All @@ -33,8 +33,8 @@

// load the observer plug in
$.getScript('/media/js/fontfaceobserver-min.js')
.done(ffoLoad)
.fail(ffoFinished);
.done(ffoLoad)
.fail(ffoFinished);

// starts observers for all fonts in fonts array
function ffoLoad() {
Expand Down Expand Up @@ -111,12 +111,12 @@
var fontAttribute = index;
var fontLoaded = true;
$.each(this, function() {
if(this == false) {
if(!this) {
fontLoaded = false;
}
})
if(fontLoaded == true) {
$('html').attr("data-"+fontAttribute, true);
if(fontLoaded) {
$('html').attr('data-' + fontAttribute, true);
}
});
}
Expand Down

0 comments on commit aff4686

Please sign in to comment.