diff --git a/extension.json b/extension.json index 891e9cba..b2cc0fe7 100644 --- a/extension.json +++ b/extension.json @@ -175,13 +175,22 @@ "remoteExtPath": "UniversalLanguageSelector/resources" }, "ext.uls.displaysettings": { - "scripts": "js/ext.uls.displaysettings.js", - "styles": "css/ext.uls.displaysettings.less", + "scripts": [ + "js/ext.uls.inputsettings.js", + "js/ext.uls.displaysettings.js" + ], + "styles": [ + "css/ext.uls.inputsettings.less", + "css/ext.uls.displaysettings.less" + ], "dependencies": [ + "ext.uls.ime", + "jquery.ime", "ext.uls.languagesettings", "ext.uls.mediawiki", "ext.uls.webfonts", "mediawiki.api", + "mediawiki.ui.radio", "mediawiki.ui.checkbox", "mediawiki.ui.button", "mediawiki.user" @@ -218,20 +227,6 @@ "ext.uls.common" ] }, - "ext.uls.inputsettings": { - "scripts": "js/ext.uls.inputsettings.js", - "styles": "css/ext.uls.inputsettings.less", - "dependencies": [ - "ext.uls.ime", - "ext.uls.languagesettings", - "ext.uls.mediawiki", - "jquery.ime", - "mediawiki.ui.button", - "mediawiki.ui.radio" - ], - "localBasePath": "resources", - "remoteExtPath": "UniversalLanguageSelector/resources" - }, "ext.uls.interface": { "targets": [ "desktop", "mobile" ], "scripts": "js/ext.uls.interface.js", diff --git a/resources/js/ext.uls.common.js b/resources/js/ext.uls.common.js index 1a22a35a..be76a791 100644 --- a/resources/js/ext.uls.common.js +++ b/resources/js/ext.uls.common.js @@ -32,7 +32,7 @@ mw.uls = mw.uls || {}; mw.uls.previousLanguagesStorageKey = 'uls-previous-languages'; - mw.uls.languageSettingsModules = [ 'ext.uls.inputsettings', 'ext.uls.displaysettings' ]; + mw.uls.languageSettingsModules = [ 'ext.uls.displaysettings' ]; /** * Change the language of wiki using API or set cookie and reload the page