jenkins-bot has submitted this change and it was merged.
Change subject: Fix-up mobile context and surface
......................................................................
Fix-up mobile context and surface
* No longer adding context to local overlay (will be added to toolbar in vemw
commit)
* Pass overlays into window managers
* Construct overlay in the correct frame (top-level one)
* Remove animation of context (for now anyway)
Change-Id: Iafe64a6f4e5c83554be27a60b3b7b2536bf3298d
---
M modules/ve/ui/styles/ve.ui.MobileContext.css
M modules/ve/ui/ve.ui.MobileContext.js
M modules/ve/ui/ve.ui.MobileSurface.js
3 files changed, 8 insertions(+), 20 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/styles/ve.ui.MobileContext.css
b/modules/ve/ui/styles/ve.ui.MobileContext.css
index a4da51c..79b55a9 100644
--- a/modules/ve/ui/styles/ve.ui.MobileContext.css
+++ b/modules/ve/ui/styles/ve.ui.MobileContext.css
@@ -12,21 +12,4 @@
top: 3.35em;
background: #fff;
width: 100%;
- /* Hide the context by translating it by -200% (of its height). -100%
would
- * be enough if it wasn't for the way we hide fixed headers on iOS in
- * MobileFrontend when scrolling (we fade the headers out so if the
context
- * was hidden under the main header, they would overlap when
- * semitransparent).
- */
- -webkit-transform: translate3d(0, -200%, 0);
- transform: translate3d(0, -200%, 0);
-
- -webkit-transition: -webkit-transform .3s;
- transition: transform .3s;
-}
-
-.ve-ui-mobileContext-visible {
- /* Remove transform to show the context. */
- -webkit-transform: none;
- transform: none;
}
diff --git a/modules/ve/ui/ve.ui.MobileContext.js
b/modules/ve/ui/ve.ui.MobileContext.js
index b7938d9..5b05de8 100644
--- a/modules/ve/ui/ve.ui.MobileContext.js
+++ b/modules/ve/ui/ve.ui.MobileContext.js
@@ -47,7 +47,10 @@
* @inheritdoc
*/
ve.ui.MobileContext.prototype.createInspectorWindowManager = function () {
- return new ve.ui.MobileWindowManager( { '$': this.$, 'factory':
ve.ui.windowFactory } );
+ return new ve.ui.MobileWindowManager( {
+ 'factory': ve.ui.windowFactory,
+ 'overlay': this.surface.getGlobalOverlay()
+ } );
};
/**
diff --git a/modules/ve/ui/ve.ui.MobileSurface.js
b/modules/ve/ui/ve.ui.MobileSurface.js
index 4994952..05ea57f 100644
--- a/modules/ve/ui/ve.ui.MobileSurface.js
+++ b/modules/ve/ui/ve.ui.MobileSurface.js
@@ -30,7 +30,6 @@
// Initialization
this.globalOverlay.$element
.addClass( 've-ui-mobileSurface-overlay
ve-ui-mobileSurface-overlay-global' );
- this.localOverlay.$element.append( this.context.$element );
};
/* Inheritance */
@@ -83,5 +82,8 @@
* @inheritdoc
*/
ve.ui.MobileSurface.prototype.createDialogWindowManager = function () {
- return new ve.ui.MobileWindowManager( { 'factory': ve.ui.windowFactory
} );
+ return new ve.ui.MobileWindowManager( {
+ 'factory': ve.ui.windowFactory,
+ 'overlay': this.globalOverlay
+ } );
};
--
To view, visit https://gerrit.wikimedia.org/r/146908
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iafe64a6f4e5c83554be27a60b3b7b2536bf3298d
Gerrit-PatchSet: 3
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
