Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399409 )
Change subject: Remove unused …-inprogress messages from $.wikibase.edittoolbar
......................................................................
Remove unused …-inprogress messages from $.wikibase.edittoolbar
This is a direct follow up for I5bf50ea. One of the unused messages
was there before, the second was introduced in I5bf50ea.
Bug: T161367
Change-Id: I5a136b8338dbbe57fa408d0bd074bb65634403b3
---
M view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
M view/resources/jquery/wikibase/toolbar/resources.php
M view/resources/wikibase/view/ToolbarViewController.js
3 files changed, 7 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/09/399409/1
diff --git
a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
index bcd335c..dfc13e3 100644
--- a/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
+++ b/view/resources/jquery/wikibase/toolbar/jquery.wikibase.edittoolbar.js
@@ -46,7 +46,7 @@
onRemove: null,
buttonLabels: {
edit: mw.msg( 'wikibase-edit' ),
- save: mw.config.get(
'wgEditSubmitButtonLabelPublish' ) ? mw.msg( 'wikibase-publish' ) : mw.msg(
'wikibase-save' ),
+ save: mw.msg( mw.config.get(
'wgEditSubmitButtonLabelPublish' ) ? 'wikibase-publish' : 'wikibase-save' ),
remove: mw.msg( 'wikibase-remove' ),
cancel: mw.msg( 'wikibase-cancel' )
}
diff --git a/view/resources/jquery/wikibase/toolbar/resources.php
b/view/resources/jquery/wikibase/toolbar/resources.php
index fc9e704..e7d6812 100644
--- a/view/resources/jquery/wikibase/toolbar/resources.php
+++ b/view/resources/jquery/wikibase/toolbar/resources.php
@@ -49,8 +49,6 @@
'wikibase-remove-inprogress',
'wikibase-save',
'wikibase-publish',
- 'wikibase-save-inprogress',
- 'wikibase-publish-inprogress',
],
],
diff --git a/view/resources/wikibase/view/ToolbarViewController.js
b/view/resources/wikibase/view/ToolbarViewController.js
index e1fb20f..1f6f047 100644
--- a/view/resources/wikibase/view/ToolbarViewController.js
+++ b/view/resources/wikibase/view/ToolbarViewController.js
@@ -138,12 +138,12 @@
return;
}
- var self = this;
- if ( mw.config.get( 'wgEditSubmitButtonLabelPublish' ) ) {
- this._toolbar.toggleActionMessage( mw.msg(
'wikibase-publish-inprogress' ) );
- } else {
- this._toolbar.toggleActionMessage( mw.msg(
'wikibase-save-inprogress' ) );
- }
+ var self = this,
+ messageKey = mw.config.get(
'wgEditSubmitButtonLabelPublish' )
+ ? 'wikibase-publish-inprogress'
+ : 'wikibase-save-inprogress';
+
+ this._toolbar.toggleActionMessage( mw.msg( messageKey ) );
this._model.save( this._view.value(), this._value ).done(
function ( savedValue ) {
self.setValue( savedValue );
self._view.value( savedValue );
--
To view, visit https://gerrit.wikimedia.org/r/399409
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a136b8338dbbe57fa408d0bd074bb65634403b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
