jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356563 )
Change subject: Disable edit buttons during base version selection
......................................................................
Disable edit buttons during base version selection
Change-Id: Iae9a59249d640ed6e573183da4326f64b03a6be9
Depends-On: I4d23f57fd0cda4b8539ffb17a2a19ecd822e077a
---
M modules/ext.TwoColConflict.init.js
1 file changed, 29 insertions(+), 4 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, but someone else must approve
jenkins-bot: Verified
Andrew-WMDE: Looks good to me, approved
diff --git a/modules/ext.TwoColConflict.init.js
b/modules/ext.TwoColConflict.init.js
index 4a0e315..09b0585 100644
--- a/modules/ext.TwoColConflict.init.js
+++ b/modules/ext.TwoColConflict.init.js
@@ -136,7 +136,35 @@
adjustEditorColSpacing( false );
}
+ function disableEditButtons() {
+ if ( $( '#wpSaveWidget' ).length ) {
+ OO.ui.infuse( 'wpSaveWidget' ).setDisabled( true );
+ OO.ui.infuse( 'wpPreviewWidget' ).setDisabled( true );
+ OO.ui.infuse( 'wpDiffWidget' ).setDisabled( true );
+ } else {
+ // not using OOUI buttons
+ $( '#wpSave, #wpPreview, #wpDiff' ).prop( 'disabled',
true );
+ }
+ }
+
+ function enableEditButtons() {
+ if ( $( '#wpSaveWidget' ).length ) {
+ OO.ui.infuse( 'wpSaveWidget' ).setDisabled( false );
+ OO.ui.infuse( 'wpPreviewWidget' ).setDisabled( false );
+ OO.ui.infuse( 'wpDiffWidget' ).setDisabled( false );
+ } else {
+ $( '#wpSave, #wpPreview, #wpDiff' ).prop( 'disabled',
false );
+ }
+ }
+
+ function beforeBaseVersionSelection() {
+ disableEditButtons();
+ $( '.mw-twocolconflict-edit-desc' ).hide();
+ $( '.mw-twocolconflict-base-selection-desc' ).show();
+ }
+
function afterBaseVersionSelection() {
+ enableEditButtons();
$( '.mw-twocolconflict-form' ).removeClass(
'mw-twocolconflict-before-base-selection' );
// select 'hide' as the default option
$( 'input[name="mw-twocolconflict-same"]' )[ 1 ].click();
@@ -149,14 +177,11 @@
windowManager = new OO.ui.WindowManager( {
modal: false
} );
-
+ beforeBaseVersionSelection();
$( '.mw-twocolconflict-col-header' ).append(
windowManager.$element );
versionSelector.setCloseCallback( afterBaseVersionSelection );
windowManager.addWindows( [ versionSelector ] );
windowManager.openWindow( versionSelector );
-
- $( '.mw-twocolconflict-edit-desc' ).hide();
- $( '.mw-twocolconflict-base-selection-desc' ).show();
}
$( function () {
--
To view, visit https://gerrit.wikimedia.org/r/356563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae9a59249d640ed6e573183da4326f64b03a6be9
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
