jenkins-bot has submitted this change and it was merged.
Change subject: Fix undo form for OO UI selection changes
......................................................................
Fix undo form for OO UI selection changes
Activate editor after it's in DOM.
Bug: T117835
Change-Id: I925c022401fbd1db78328cb971c20e2e7ed52ffd
(cherry picked from commit 72cdd314f101d136b17785f40b6337eaffdedea3)
---
M modules/flow-initialize.js
M modules/mw.flow.Initializer.js
2 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/flow-initialize.js b/modules/flow-initialize.js
index 73a49e2..70ec772 100644
--- a/modules/flow-initialize.js
+++ b/modules/flow-initialize.js
@@ -44,7 +44,7 @@
// For reference and debugging
mw.flow.system = initializer.getDataModelSystem();
- if ( initializer.isDiffPage() ) {
+ if ( initializer.isUndoForm() ) {
// Setup undo pages
initializer.setupUndoPage();
} else {
diff --git a/modules/mw.flow.Initializer.js b/modules/mw.flow.Initializer.js
index a1b338f..350e938 100644
--- a/modules/mw.flow.Initializer.js
+++ b/modules/mw.flow.Initializer.js
@@ -688,6 +688,15 @@
// function, so make a forced connection
editor.error = error;
+ $wrapper = $( '<div>' )
+ .append(
+ error.$element,
+ anonWarning.$element,
+ editor.$element
+ );
+
+ $domToReplace.replaceWith( $wrapper );
+
// Prepare the editor
editor.pushPending();
editor.activate();
@@ -724,23 +733,15 @@
// returnToBoard();
} );
- $wrapper = $( '<div>' )
- .append(
- error.$element,
- anonWarning.$element,
- editor.$element
- );
- $domToReplace.replaceWith( $wrapper );
-
return editor;
};
/**
- * Check whether we are on a diff page
+ * Check whether we are on an undo form page
*
- * @return {boolean} The page is a diff page
+ * @return {boolean} The page is an in-progress undo form
*/
- mw.flow.Initializer.prototype.isDiffPage = function () {
+ mw.flow.Initializer.prototype.isUndoForm = function () {
return !!( $( 'form[data-module="topic"]' ).length ||
$( 'form[data-module="header"]' ).length );
};
--
To view, visit https://gerrit.wikimedia.org/r/251246
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I925c022401fbd1db78328cb971c20e2e7ed52ffd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: wmf/1.27.0-wmf.5
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
