diff --git a/extension.json b/extension.json index d0e1ca8a..c94563fd 100644 --- a/extension.json +++ b/extension.json @@ -346,24 +346,20 @@ "jquery.client" ] }, - "ext.uls.webfonts.fonts": { - "dependencies": [ - "jquery.webfonts", - "ext.uls.webfonts.repository" - ] - }, "ext.uls.webfonts.mobile": { "scripts": "js/ext.uls.webfonts.mobile.js", "targets": [ "mobile" ], "dependencies": [ - "jquery.webfonts", "ext.uls.webfonts.repository" ] }, "ext.uls.webfonts.repository": { - "scripts": "js/ext.uls.webfonts.repository.js", + "scripts": [ + "../lib/jquery.webfonts/src/jquery.webfonts.js", + "js/ext.uls.webfonts.repository.js" + ], "targets": [ "desktop", "mobile" @@ -418,15 +414,6 @@ "localBasePath": "lib", "remoteExtPath": "UniversalLanguageSelector/lib" }, - "jquery.webfonts": { - "scripts": "jquery.webfonts/src/jquery.webfonts.js", - "targets": [ - "desktop", - "mobile" - ], - "localBasePath": "lib", - "remoteExtPath": "UniversalLanguageSelector/lib" - }, "rangy.core": { "scripts": "rangy/rangy-core.js", "localBasePath": "lib", diff --git a/resources/js/ext.uls.displaysettings.js b/resources/js/ext.uls.displaysettings.js index 3e532bac..ac0bff16 100644 --- a/resources/js/ext.uls.displaysettings.js +++ b/resources/js/ext.uls.displaysettings.js @@ -122,7 +122,7 @@ */ setupWebFonts: function () { var d = $.Deferred(); - mw.loader.using( [ 'ext.uls.webfonts.fonts' ] ).then( function () { + mw.loader.using( [ 'ext.uls.webfonts.repository' ] ).then( function () { if ( this.isWebFontsEnabled ) { mw.webfonts.setup(); } diff --git a/resources/js/ext.uls.webfonts.js b/resources/js/ext.uls.webfonts.js index 9d7d7372..e2d61624 100644 --- a/resources/js/ext.uls.webfonts.js +++ b/resources/js/ext.uls.webfonts.js @@ -137,7 +137,7 @@ if ( mw.webfonts.preferences.isEnabled() ) { // Queue to next idle period to optimize loading. mw.requestIdleCallback( function () { - mw.loader.using( 'ext.uls.webfonts.fonts' ).then( mw.webfonts.setup ); + mw.loader.using( 'ext.uls.webfonts.repository' ).then( mw.webfonts.setup ); } ); } } );