src/core/font.js in webfontloader-1.1.2 vs src/core/font.js in webfontloader-1.2.0
- old
+ new
@@ -24,11 +24,11 @@
this.domHelper_ = new webfont.DomHelper(this.mainWindow_, context);
var eventDispatcher = new webfont.EventDispatcher(
this.domHelper_, context.document.documentElement, configuration);
- if (this.userAgent_.isSupportingWebFont()) {
+ if (this.userAgent_.getBrowserInfo().hasWebFontSupport()) {
this.load_(eventDispatcher, configuration);
} else {
eventDispatcher.dispatchInactive();
}
};
@@ -75,13 +75,13 @@
var modules = this.fontModuleLoader_.getModules(configuration, this.domHelper_),
self = this;
this.moduleFailedLoading_ = this.moduleLoading_ = modules.length;
- var fontWatcher = new webfont.FontWatcher(this.domHelper_,
+ var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.domHelper_,
eventDispatcher, {
- getWidth: function(elem) {
- return elem.offsetWidth;
+ getSize: function(elem) {
+ return new webfont.Size(elem.offsetWidth, elem.offsetHeight);
}}, self.asyncCall_, function() {
return new Date().getTime();
});
for (var i = 0, len = modules.length; i < len; i++) {