Skip to content

Specified webfont version or use 1.5 by default. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
spalax wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Specified webfont version or use 1.5 by default. #72

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3dace3
Add more specific version of WebFont loader library to prevent broke …
spalax Jan 18, 2016
dad9650
Implement possibilities to declare version of Web Font loader to be u…
spalax Feb 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/font.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
define(['propertyParser'], function (propertyParser) {

var rParts = /^([^,]+),([^\|]+)\|?/;
var rParts = /^([^,]+),([^\|]+)\|?/i;

function parseName(name) {
var data = {},
Expand All @@ -29,12 +29,21 @@ define(['propertyParser'], function (propertyParser) {
if (config.isBuild) {
onLoad(null); //avoid errors on the optimizer
} else {
var data = parseName(name);
var data = parseName(name),
fontLoaderVersion = '1.5'; // Available versions listed at
Copy link

@luca-borrione luca-borrione Oct 31, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to use webfontVersion instead of fontLoaderVersion perhaps?
It would look more clear to me, what do you think?

// https://developers.google.com/speed/libraries/#web-font-loader

data.active = onLoad;
data.inactive = function(){
onLoad(false);
};
req([(document.location.protocol === 'https:'? 'https' : 'http') +'://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js'], function(){

if (config && config.fontLoaderVersion !== undefined) {
fontLoaderVersion = config.fontLoaderVersion;
}

req([(document.location.protocol === 'https:'? 'https' : 'http') +
'://ajax.googleapis.com/ajax/libs/webfont/' + fontLoaderVersion +'/webfont.js'], function(){
WebFont.load(data);
});
}
Expand Down