From 63b5de3a8335a178dba41f68256e8bedd31d3213 Mon Sep 17 00:00:00 2001 From: Matthias Mullie Date: Wed, 4 Mar 2015 17:04:17 +0100 Subject: [PATCH] Correct jquery.uls dependencies ve.init.mw.Platform.js, ve.init.sa.Platform.js & ve.ui.MWLanguagesPage.js use $.uls, but nothing in the ext.visualEditor.core module does. Change-Id: I0b3d8c2b25694e29c86b91d7df7875f1be24fb2d --- VisualEditor.php | 4 +++- extension.json | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/VisualEditor.php b/VisualEditor.php index 5c44a1e57b..3c7598c9ee 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -314,6 +314,7 @@ $wgResourceModules += array( 'moment', 'ext.visualEditor.base', 'ext.visualEditor.track', + 'jquery.uls.data', ), 'targets' => array( 'desktop', 'mobile' ), ), @@ -343,6 +344,7 @@ $wgResourceModules += array( 'dependencies' => array( 'ext.visualEditor.base', 'jquery.i18n', + 'jquery.uls.data', ), ), @@ -668,7 +670,6 @@ $wgResourceModules += array( 'unicodejs', 'rangefix', 'papaparse', - 'jquery.uls.data', 'ext.visualEditor.base', ), 'messages' => array( @@ -1175,6 +1176,7 @@ $wgResourceModules += array( 'dependencies' => array( 'ext.visualEditor.mwcore', 'ext.visualEditor.mwlink', + 'jquery.uls.data', ), 'messages' => array( 'visualeditor-advancedsettings-tool', diff --git a/extension.json b/extension.json index 880436d904..4a76843a40 100644 --- a/extension.json +++ b/extension.json @@ -396,7 +396,8 @@ "user.tokens", "moment", "ext.visualEditor.base", - "ext.visualEditor.track" + "ext.visualEditor.track", + "jquery.uls.data" ], "targets": [ "desktop", @@ -427,7 +428,8 @@ ], "dependencies": [ "ext.visualEditor.base", - "jquery.i18n" + "jquery.i18n", + "jquery.uls.data" ] }, "ext.visualEditor.data": { @@ -721,7 +723,6 @@ "unicodejs", "rangefix", "papaparse", - "jquery.uls.data", "ext.visualEditor.base" ], "messages": [ @@ -1200,7 +1201,8 @@ ], "dependencies": [ "ext.visualEditor.mwcore", - "ext.visualEditor.mwlink" + "ext.visualEditor.mwlink", + "jquery.uls.data" ], "messages": [ "visualeditor-advancedsettings-tool",