From bd745a7869906ac08b207cbdb957e896f4173c46 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Tue, 16 Jun 2015 20:14:35 +0100 Subject: [PATCH] Move dependency on user.tokens from mediawiki.api.edit to mediawiki.api The postWithToken() method used to be specific to the edit module. However that logic was moved and refactored into getToken() and postWithToken() a while back. While waiting for user.tokens instead of making api requests for tokens is worth it. The logic in mediawiki.api.js inspects mw.user.tokens only at initial run time. So it must be on 'mediawiki.api'. Anyhow, in practice it doesn't matter since the user.tokens is embedded in the page. So there's no actual waiting of any kind. Change-Id: I10fae93c8f1500b4aa752101256fbba94c2ae40d --- resources/Resources.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/Resources.php b/resources/Resources.php index 7c2a9dff30..c280770856 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -820,7 +820,10 @@ return array( ), 'mediawiki.api' => array( 'scripts' => 'resources/src/mediawiki.api/mediawiki.api.js', - 'dependencies' => 'mediawiki.util', + 'dependencies' => array( + 'mediawiki.util', + 'user.tokens', + ), 'targets' => array( 'desktop', 'mobile' ), ), 'mediawiki.api.category' => array( @@ -835,7 +838,6 @@ return array( 'dependencies' => array( 'mediawiki.api', 'mediawiki.Title', - 'user.tokens', ), 'targets' => array( 'desktop', 'mobile' ), ), @@ -856,7 +858,6 @@ return array( 'scripts' => 'resources/src/mediawiki.api/mediawiki.api.watch.js', 'dependencies' => array( 'mediawiki.api', - 'user.tokens', ), ), 'mediawiki.content.json' => array( -- 2.20.1