jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/378749 )
Change subject: resourceloader: Implement isKnownEmpty for user.options module
......................................................................
resourceloader: Implement isKnownEmpty for user.options module
This allows ResourceLoaderClientHtml to output state=ready instead
of state=loading with a no-op mw.loader.implement() call being embedded.
Test Plan:
* View source on page view when logged-out.
* Before:
- loader.state({"user.options":"loading"})
- loader.implement("user.options@..",function(){ .. user.options.state([]) })
* After:
- loader.state({"user.options":"ready"})
Bug: T176159
Change-Id: I18f76eaa960da9b0ca77f28e10f768587447a838
---
M includes/resourceloader/ResourceLoaderUserOptionsModule.php
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
index 0c332cf..a15d310 100644
--- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php
@@ -65,6 +65,14 @@
}
/**
+ * @param ResourceLoaderContext $context
+ * @return bool
+ */
+ public function isKnownEmpty( ResourceLoaderContext $context ) {
+ return !$context->getUserObj()->getOptions(
User::GETOPTIONS_EXCLUDE_DEFAULTS );
+ }
+
+ /**
* @return string
*/
public function getGroup() {
--
To view, visit https://gerrit.wikimedia.org/r/378749
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18f76eaa960da9b0ca77f28e10f768587447a838
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Phedenskog <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
