jenkins-bot has submitted this change and it was merged.
Change subject: Prepare the groupselector early and use dataready event to
render data
......................................................................
Prepare the groupselector early and use dataready event to render data
Change-Id: I9b464380c4047a83fa280d94b294c2b35cbaa032
---
M resources/js/ext.translate.groupselector.js
M resources/js/ext.translate.special.translate.js
2 files changed, 15 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.groupselector.js
b/resources/js/ext.translate.groupselector.js
index 63136bf..9e1eaf8 100644
--- a/resources/js/ext.translate.groupselector.js
+++ b/resources/js/ext.translate.groupselector.js
@@ -24,8 +24,11 @@
if ( this.hasChildGroups( this.parentGroupId ) ) {
this.prepareSelectorMenu();
this.position();
- this.loadGroups( this.parentGroupId );
this.listen();
+ if ( mw.translate.messageGroups !== {} ) {
+ // If data is ready, render now.
+ this.$group.trigger(
'dataready.translate' );
+ }
}
},
@@ -136,6 +139,12 @@
groupSelector.hide();
} );
+ groupSelector.$group.on( 'dataready.translate',
function () {
+ if ( groupSelector.hasChildGroups(
groupSelector.parentGroupId ) ) {
+ groupSelector.loadGroups(
groupSelector.parentGroupId );
+ }
+ } );
+
groupSelector.$group.on( 'click', function ( e ) {
groupSelector.toggle();
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 87a920e..899d6cf 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -299,16 +299,17 @@
ourWindowOnBeforeUnloadRegister();
prepareWorkflowSelector();
+ $( '.ext-translate-msggroup-selector .grouplink'
).msggroupselector( {
+ onSelect: mw.translate.changeGroup
+ } );
+
$.when(
// Get ready with language stats
mw.translate.loadLanguageStats( targetLanguage ),
// Get ready with message groups
mw.translate.loadMessageGroups()
).then( function () {
- $( '.ext-translate-msggroup-selector .grouplink'
).msggroupselector( {
- onSelect: mw.translate.changeGroup
- } );
-
+ $( '.ext-translate-msggroup-selector .grouplink'
).trigger( 'dataready.translate' );
$( '.tux-message-list-statsbar' ).languagestatsbar( {
language: targetLanguage,
group: $( '.tux-message-list-statsbar' ).data(
'messagegroup' )
--
To view, visit https://gerrit.wikimedia.org/r/54631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9b464380c4047a83fa280d94b294c2b35cbaa032
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
