JGonera has uploaded a new change for review.

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

Change subject: Allow more zooming
......................................................................

Allow more zooming

Set maximum-scale to the default for Safari (5.0):
https://developer.apple.com/library/ios/documentation/appleapplications/reference/safariwebcontent/usingtheviewport/usingtheviewport.html

Also, remove a FIXME that its author doesn't understand.

Bug: 66892
Change-Id: I8b9c76e5f18c07dbbc7a376b4bfdabafe51a9ffd
---
M includes/skins/SkinMinerva.php
M javascripts/common/application.js
2 files changed, 4 insertions(+), 5 deletions(-)


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

diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 4b7622e..687e9b8 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -40,7 +40,7 @@
                        Html::element(
                                'meta', array(
                                        'name' => 'viewport',
-                                       'content' => 'initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=1.6',
+                                       'content' => 'initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=5.0',
                                )
                        )
                );
diff --git a/javascripts/common/application.js 
b/javascripts/common/application.js
index 3ae632e..ef300d0 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -174,10 +174,9 @@
 
                $viewportMeta = $( 'meta[name="viewport"]' );
                viewport = $viewportMeta.attr( 'content' );
-               // FIXME: If minimum-scale and maximum-scale are not set 
locking viewport will prevent a reset
-               if ( viewport && viewport.indexOf( 'minimum-scale' ) === -1 ) {
-                       viewport += ', minimum-scale=0.25, maximum-scale=1.6';
-               }
+               // FIXME: remove when cache updates (a month)
+               $viewportMeta.attr( 'content', 'initial-scale=1.0, 
user-scalable=yes, minimum-scale=0.25, maximum-scale=5.0' );
+
 
                // when rotating to landscape stop page zooming on ios
                // allow disabling of transitions in android ics 4.0.2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b9c76e5f18c07dbbc7a376b4bfdabafe51a9ffd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to