jenkins-bot has submitted this change and it was merged.
Change subject: Update statsbar when changing group
......................................................................
Update statsbar when changing group
Bug: 46879
Change-Id: Ic769bfc93a365e4908a5fb2328123e8ddfcda28b
---
M resources/js/ext.translate.messagetable.js
M resources/js/ext.translate.special.translate.js
M resources/js/ext.translate.statsbar.js
3 files changed, 14 insertions(+), 21 deletions(-)
Approvals:
Amire80: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/js/ext.translate.messagetable.js
b/resources/js/ext.translate.messagetable.js
index 56d42fd..e42c084 100644
--- a/resources/js/ext.translate.messagetable.js
+++ b/resources/js/ext.translate.messagetable.js
@@ -38,12 +38,15 @@
},
loadMessages: function ( changes ) {
- var $loader = $( '.tux-messagetable-loader' );
+ // FIXME: this should be member method
+ var $container = $( '.tux-messagelist' ),
+ $loader = $( '.tux-messagetable-loader' ),
+ $statsbar = $( '.tux-message-list-statsbar' );
changes = changes || {};
// Clear current messages
- $( '.tux-messagelist' ).trigger( 'clear' );
+ $container.trigger( 'clear' );
// Change the properties that are provided
if ( changes.filter !== undefined ) {
@@ -56,6 +59,15 @@
// Reset the number of messages remaining
$loader.find( '.tux-messagetable-loader-count' ).text(
'' );
+ // Reset the statsbar
+ $statsbar
+ .empty()
+ .removeData()
+ .languagestatsbar( {
+ language: $container.data(
'targetlangcode' ),
+ group: $loader.data( 'messagegroup' )
+ } );
+
// Reset other info and make visible
$loader
.removeData( 'offset' )
diff --git a/resources/js/ext.translate.special.translate.js
b/resources/js/ext.translate.special.translate.js
index 8eb6dee..388396f 100644
--- a/resources/js/ext.translate.special.translate.js
+++ b/resources/js/ext.translate.special.translate.js
@@ -135,7 +135,6 @@
} );
mw.translate.changeUrl( changes );
- $( '.tux-statsbar' ).trigger( 'refresh', language );
mw.translate.loadMessages();
updateGroupWarning();
},
@@ -268,11 +267,6 @@
mw.translate.loadMessageGroups()
).then( function () {
$( '.ext-translate-msggroup-selector .grouplink'
).trigger( 'dataready.translate' );
- $( '.tux-message-list-statsbar' ).languagestatsbar( {
- language: targetLanguage,
- group: $( '.tux-message-list-statsbar' ).data(
'messagegroup' )
- } );
-
updateGroupWarning();
} );
diff --git a/resources/js/ext.translate.statsbar.js
b/resources/js/ext.translate.statsbar.js
index b478892..12ef08d 100644
--- a/resources/js/ext.translate.statsbar.js
+++ b/resources/js/ext.translate.statsbar.js
@@ -76,14 +76,6 @@
statsbar.update();
} );
- statsbar.$statsBar.on( 'refresh', function ( e,
language ) {
- statsbar.language = language;
-
- mw.translate.loadLanguageStats( language
).done( function () {
- statsbar.update();
- } );
- } );
-
statsbar.$container.hover( function () {
statsbar.$statsBar.find( '.tux-statsbar-info'
).removeClass( 'hide' );
}, function () {
@@ -104,7 +96,6 @@
$( '<div>' ).addClass( 'tux-statsbar-info hide'
)
);
- // TODO Add a tooltip for the statsbar that says the
stats in words.
this.$container.append( this.$statsBar );
this.update();
@@ -185,10 +176,6 @@
if ( !data ) {
$this.data( 'languagestatsbar', ( data = new
LanguageStatsBar( this, options ) ) );
- }
-
- if ( typeof options === 'string' ) {
- data[options].call( $this );
}
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/62345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic769bfc93a365e4908a5fb2328123e8ddfcda28b
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Amire80 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
