jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Fix ve.ui.Overlay classes
......................................................................
[BREAKING CHANGE] Fix ve.ui.Overlay classes
Rename to ve-ui-overlay-(global|local) and give the overlay
in the language input widget a global class otherwise it doesn't
shield the personal toolbar.
Breaking change: ve-ui-surface-(global|local)Overlay renamed.
Bug: 68486
Change-Id: Ia99d368a41ab581a2bd4e3e39d6fc6efe5e6ffb4
---
M modules/ve/ui/ve.ui.Surface.js
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
2 files changed, 6 insertions(+), 11 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/ve.ui.Surface.js b/modules/ve/ui/ve.ui.Surface.js
index 30a778c..c6f39f2 100644
--- a/modules/ve/ui/ve.ui.Surface.js
+++ b/modules/ve/ui/ve.ui.Surface.js
@@ -26,8 +26,8 @@
OO.EventEmitter.call( this, config );
// Properties
- this.globalOverlay = new ve.ui.Overlay();
- this.localOverlay = new ve.ui.Overlay( { $: this.$ } );
+ this.globalOverlay = new ve.ui.Overlay( { classes:
['ve-ui-overlay-global'] } );
+ this.localOverlay = new ve.ui.Overlay( { $: this.$, classes:
['ve-ui-overlay-local'] } );
this.$blockers = this.$( '<div>' );
this.$controls = this.$( '<div>' );
if ( dataOrDoc instanceof ve.dm.Document ) {
@@ -56,12 +56,8 @@
this.$element
.addClass( 've-ui-surface' )
.append( this.view.$element );
- this.localOverlay.$element
- .addClass( 've-ui-surface-localOverlay' )
- .append( this.$blockers, this.$controls );
- this.globalOverlay.$element
- .addClass( 've-ui-surface-globalOverlay' )
- .append( this.dialogs.$element );
+ this.localOverlay.$element.append( this.$blockers, this.$controls );
+ this.globalOverlay.$element.append( this.dialogs.$element );
// Make instance globally accessible for debugging
ve.instances.push( this );
diff --git a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
index 1527e33..ead9ad5 100644
--- a/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
+++ b/modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
@@ -23,7 +23,7 @@
// Properties
this.annotation = null;
- this.overlay = new ve.ui.Overlay();
+ this.overlay = new ve.ui.Overlay( { classes: ['ve-ui-overlay-global'] }
);
this.dialogs = new OO.ui.WindowManager( { factory: ve.ui.windowFactory
} );
this.findLanguageButton = new OO.ui.ButtonWidget( {
$: this.$,
@@ -77,8 +77,7 @@
] );
this.overlay.$element.append( this.dialogs.$element );
$( 'body' ).append( this.overlay.$element );
- // TODO: Rethink the layout, maybe integrate the change button into the
language field
- // TODO: Consider using getAutonym to display a nicer language name
label somewhere
+
this.$element
.addClass( 've-ui-langInputWidget' )
.append(
--
To view, visit https://gerrit.wikimedia.org/r/149635
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia99d368a41ab581a2bd4e3e39d6fc6efe5e6ffb4
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: Trevor Parscal <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
