[MediaWiki-commits] [Gerrit] Restrict iOS fixed header code to overlays with fixed headers - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/160855

Change subject: Restrict iOS fixed header code to overlays with fixed headers
......................................................................

Restrict iOS fixed header code to overlays with fixed headers

This allows pinch zooming in the media viewer overlay
Bug: 69414

Change-Id: Ic89c869daa1d4f2bd3e57da1fc2ba4c9366b9bc1
---
M javascripts/common/Overlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
2 files changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/55/160855/1

diff --git a/javascripts/common/Overlay.js b/javascripts/common/Overlay.js
index a17189d..3950435 100644
--- a/javascripts/common/Overlay.js
+++ b/javascripts/common/Overlay.js
@@ -12,6 +12,11 @@
         */
        Overlay = View.extend( {
                /**
+                * Identify whether the element contains position fixed elements
+                * @type {Boolean}
+                */
+               hasFixedHeader: true,
+               /**
                 * FIXME: remove when OverlayManager used everywhere
                 * @type {Boolean}
                 */
@@ -67,7 +72,7 @@
                                ev.stopPropagation();
                        } );
 
-                       if ( M.isIos ) {
+                       if ( M.isIos && this.hasFixedHeader ) {
                                $overlayContent
                                .on( 'touchstart', function( ev ) {
                                        startY = 
ev.originalEvent.touches[0].pageY;
@@ -130,7 +135,7 @@
                        }
 
                        // prevent scrolling and bouncing outside of 
.overlay-content
-                       if ( M.isIos ) {
+                       if ( M.isIos && this.hasFixedHeader ) {
                                $window
                                        .on( 'touchmove.ios', function( ev ) {
                                                ev.preventDefault();
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js 
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 62287e0..421b486 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -11,6 +11,8 @@
         * @extends Overlay
         */
        ImageOverlay = Overlay.extend( {
+               // allow pinch zooming
+               hasFixedHeader: false,
                className: 'overlay media-viewer',
                template: M.template.get( 'modules/ImageOverlay.hogan' ),
                closeOnBack: true,

-- 
To view, visit https://gerrit.wikimedia.org/r/160855
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic89c869daa1d4f2bd3e57da1fc2ba4c9366b9bc1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits