https://www.mediawiki.org/wiki/Special:Code/MediaWiki/106305
Revision: 106305
Author: preilly
Date: 2011-12-15 02:16:12 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------
1.18wmf1: MFT r106304
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/MobileFrontend/ApplicationTemplate.php
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/ApplicationTemplate.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/MobileFrontend/ApplicationTemplate.php
2011-12-15 02:15:35 UTC (rev 106304)
+++ branches/wmf/1.18wmf1/extensions/MobileFrontend/ApplicationTemplate.php
2011-12-15 02:16:12 UTC (rev 106305)
@@ -24,7 +24,7 @@
$endScriptTag = '"></script>';
$javaScriptPath = $this->data['wgExtensionAssetsPath'] .
'/MobileFrontend/javascripts/';
- $openSearchScript = $startScriptTag . $javaScriptPath .
$betaPrefix . 'opensearch.js?version=12142011126437' . $endScriptTag;
+ $openSearchScript = $startScriptTag . $javaScriptPath .
$betaPrefix . 'opensearch.js?version=12142011129437' . $endScriptTag;
$jQueryScript = ( $this->data['device']['supports_jquery'] ) ?
$startScriptTag . $javaScriptPath . 'jquery-1.7.1.min.js' . $endScriptTag : '';
$filePageScript = ( $this->data['isFilePage'] ) ?
$startScriptTag . $javaScriptPath . 'filepage.js' . $endScriptTag : '';
Modified:
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
===================================================================
---
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
2011-12-15 02:15:35 UTC (rev 106304)
+++
branches/wmf/1.18wmf1/extensions/MobileFrontend/javascripts/beta_opensearch.js
2011-12-15 02:16:12 UTC (rev 106305)
@@ -22,10 +22,26 @@
function hideResults() {
results.style.display = 'none';
}
+function resetViewPort() {
+ if ( navigator.userAgent.match( /iPhone/i ) ||
navigator.userAgent.match( /iPad/i ) ) {
+ var viewportmeta = document.querySelector(
'meta[name="viewport"]' );
+ if ( viewportmeta ) {
+ viewportmeta.content = 'width=device-width,
minimum-scale=1.0, maximum-scale=1.0, initial-scale=1.0';
+ document.body.addEventListener( 'gesturestart',
function () {
+ viewportmeta.content = 'width=device-width,
minimum-scale=0.25, maximum-scale=1.6';
+ }, false );
+ }
+ }
+}
+resetViewPort();
+
var focused = false;
var ol = new Object();
search.onfocus = function() {
+
+ resetViewPort();
+
if ( !focused ) {
content.style.display = 'none';
footer.style.display = 'none';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
