jenkins-bot has submitted this change and it was merged.
Change subject: Fix layout on setSurface instead of attachToolbar
......................................................................
Fix layout on setSurface instead of attachToolbar
setSurface may get called again during the lifetime of the target,
in which case we need to fix the layout each time.
Change-Id: I8a16dec4feb89f4a8afb199ef94a1edc806c9ba2
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
index 6701025..fede8d7 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -72,13 +72,19 @@
// These tools aren't available so don't bother generating them
mw.flow.ve.Target.prototype.generateCitationFeatures = function () {};
- mw.flow.ve.Target.prototype.attachToolbar = function () {
+ mw.flow.ve.Target.prototype.attachToolbar = function ( surface ) {
+ ( surface.debugBar || surface ).$element.after(
this.getToolbar().$element );
+ };
+
+ mw.flow.ve.Target.prototype.setSurface = function ( surface ) {
// HACK ve.ui.Surface appends a debugBar *after* itself instead
of putting it
// inside itself (T106927)
// Work around this by appending the toolbar after the debugBar
if it's there, and
// after the surface otherwise.
- var surface = this.getToolbar().getSurface();
( surface.debugBar || surface ).$element.after(
this.getToolbar().$element );
+
+ // Parent method
+ mw.flow.ve.Target.parent.prototype.setSurface.apply( this,
arguments );
};
mw.flow.ve.Target.prototype.setDisabled = function ( disabled ) {
--
To view, visit https://gerrit.wikimedia.org/r/290915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8a16dec4feb89f4a8afb199ef94a1edc806c9ba2
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
