jenkins-bot has submitted this change and it was merged.
Change subject: Bring back localOverlayMenus, but only in DesktopSurface
......................................................................
Bring back localOverlayMenus, but only in DesktopSurface
* Move appending context to the constructor rather than the setupContext method
* Bring back localOverlayMenus (removed in Iee68ea9) but only use them for
DesktopSurface
Change-Id: Ifb18774b34f4ddef0bf1fa0f29add8a08f2eea75
---
M modules/ve/ui/ve.ui.DesktopSurface.js
M modules/ve/ui/ve.ui.MobileSurface.js
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/ve.ui.DesktopSurface.js
b/modules/ve/ui/ve.ui.DesktopSurface.js
index aeaa2d1..b377fd5 100644
--- a/modules/ve/ui/ve.ui.DesktopSurface.js
+++ b/modules/ve/ui/ve.ui.DesktopSurface.js
@@ -19,6 +19,13 @@
ve.ui.DesktopSurface = function VeUiDesktopSurface() {
// Parent constructor
ve.ui.Surface.apply( this, arguments );
+
+ // Properties
+ this.$localOverlayMenus = this.$( '<div>' );
+
+ // Initialization
+ this.$localOverlay.append( this.$localOverlayMenus );
+ this.$localOverlayMenus.append( this.context.$element );
};
/* Inheritance */
@@ -34,5 +41,4 @@
*/
ve.ui.DesktopSurface.prototype.setupContext = function () {
this.context = new ve.ui.DesktopContext( this, { '$': this.$ } );
- this.$localOverlay.append( this.context.$element );
};
diff --git a/modules/ve/ui/ve.ui.MobileSurface.js
b/modules/ve/ui/ve.ui.MobileSurface.js
index a98bdf7..c124658 100644
--- a/modules/ve/ui/ve.ui.MobileSurface.js
+++ b/modules/ve/ui/ve.ui.MobileSurface.js
@@ -19,6 +19,9 @@
ve.ui.MobileSurface = function VeUiMobileSurface() {
// Parent constructor
ve.ui.Surface.apply( this, arguments );
+
+ // Initialization
+ this.$globalOverlay.append( this.context.$element );
};
/* Inheritance */
@@ -35,5 +38,4 @@
*/
ve.ui.MobileSurface.prototype.setupContext = function () {
this.context = new ve.ui.MobileContext( this, { '$': this.$ } );
- this.$globalOverlay.append( this.context.$element );
};
--
To view, visit https://gerrit.wikimedia.org/r/118757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb18774b34f4ddef0bf1fa0f29add8a08f2eea75
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Trevor Parscal <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
