jenkins-bot has submitted this change and it was merged.
Change subject: Fix debug bar encapsulation
......................................................................
Fix debug bar encapsulation
Change-Id: I01bb87690f7b2426c44240dedc4d21efd1e83bab
Depends-On: I2c5d722278c5f71b59ee2f8849d9babb5aff6af2
---
M modules/editor/editors/visualeditor/mw.flow.ve.Target.js
M modules/editor/editors/visualeditor/mw.flow.ve.Target.less
2 files changed, 1 insertion(+), 14 deletions(-)
Approvals:
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 fede8d7..a587e81 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.js
@@ -73,18 +73,7 @@
mw.flow.ve.Target.prototype.generateCitationFeatures = 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.
- ( surface.debugBar || surface ).$element.after(
this.getToolbar().$element );
-
- // Parent method
- mw.flow.ve.Target.parent.prototype.setSurface.apply( this,
arguments );
+ this.$element.after( this.getToolbar().$element );
};
mw.flow.ve.Target.prototype.setDisabled = function ( disabled ) {
diff --git a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
index 22f67a3..e6b1576 100644
--- a/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
+++ b/modules/editor/editors/visualeditor/mw.flow.ve.Target.less
@@ -27,8 +27,6 @@
}
.ve-ui-debugBar {
- /* Move above bottom toolbar */
- margin: -@editorToolbarHeight 0 @editorToolbarHeight;
padding: 4px 8px;
/* Make sure the surface doesn't overlay */
position: relative;
--
To view, visit https://gerrit.wikimedia.org/r/291675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01bb87690f7b2426c44240dedc4d21efd1e83bab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
