https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113881
Revision: 113881
Author: jdlrobson
Date: 2012-03-15 00:27:27 +0000 (Thu, 15 Mar 2012)
Log Message:
-----------
correct viewport resetting
viewport should be set for anything that can support it
not just iphone/ipad (palm pre for example)
also when we do reset it make sure we reset to the initial
value
Modified Paths:
--------------
trunk/extensions/MobileFrontend/javascripts/beta_opensearch.js
Modified: trunk/extensions/MobileFrontend/javascripts/beta_opensearch.js
===================================================================
--- trunk/extensions/MobileFrontend/javascripts/beta_opensearch.js
2012-03-15 00:12:47 UTC (rev 113880)
+++ trunk/extensions/MobileFrontend/javascripts/beta_opensearch.js
2012-03-15 00:27:27 UTC (rev 113881)
@@ -10,6 +10,7 @@
footer = document.getElementById( 'footer' ),
clearSearch = document.getElementById( 'clearsearch' ),
focused = false,
+ viewportmeta, originalViewport,
u = MobileFrontend.utils;
apiUrl = MobileFrontend.setting( 'scriptPath' ) + apiUrl;
@@ -17,16 +18,19 @@
function hideResults() {
results.style.display = 'none';
}
+
+ viewportmeta = u( 'meta[name="viewport"]' )
+ if ( viewportmeta ) {
+ viewportmeta = viewportmeta[0];
+ originalViewport = viewportmeta.getAttribute( 'content' );
+ }
+ // prevent auto-zoom in on clicking search for certain browsers e.g.
palm pre and ipad
function resetViewPort() {
- if ( navigator.userAgent.match( /iPhone/i ) ||
navigator.userAgent.match( /iPad/i ) ) {
- var viewportmeta = u( 'meta[name="viewport"]' );
- if ( viewportmeta ) {
- viewportmeta = viewportmeta[0];
- viewportmeta.content = 'width=device-width,
minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0';
- u( document.body ).bind( 'gesturestart',
function () {
- viewportmeta.content =
'width=device-width, initial-scale=1.0';
- } );
- }
+ if ( viewportmeta ) {
+ viewportmeta.setAttribute( 'content',
'minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0');
+ u( document.body ).bind( 'gesturestart', function () {
+ viewportmeta.setAttribute( 'content',
originalViewport );
+ } );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
