https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114934

Revision: 114934
Author:   awjrichards
Date:     2012-04-16 22:13:38 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
MFG Change-Id:  I92ca039541c6956a48a6600150ae16b367f278c5

Modified Paths:
--------------
    
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php

Modified: 
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php
===================================================================
--- 
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php
   2012-04-16 21:49:23 UTC (rev 114933)
+++ 
branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php
   2012-04-16 22:13:38 UTC (rev 114934)
@@ -29,11 +29,11 @@
                $noticeHtml = ( isset( $this->data['noticeHtml'] ) ) ? 
$this->data['noticeHtml'] : '';
 
                $startScriptTag = '<script type="text/javascript" src="';
-               $endScriptTag = '"></script>';
+               $endScriptTag = 
"?version={$wgMobileResourceVersion}\"></script>";
                $javaScriptPath =  $this->data['wgExtensionAssetsPath'] . 
'/MobileFrontend/javascripts/';
 
                $jQuerySupport = $this->data['device']['supports_jquery'];
-               $jQueryScript = $jQuerySupport ? $startScriptTag . 
$javaScriptPath . 'jquery-1.7.2.min.js' . $endScriptTag : '';
+               $jQueryScript = $jQuerySupport ? 
"{$startScriptTag}{$javaScriptPath}jquery-1.7.2.min.js{$endScriptTag}" : '';
                $filePageScript = ( $this->data['isFilePage'] ) ? 
$startScriptTag . $javaScriptPath . 'filepage.js?version=' . 
$wgMobileResourceVersion . $endScriptTag : '';
 
                $robots = isset( $this->data['robots'] ) ? "\n                  
{$this->data['robots']}" : '';
@@ -64,7 +64,7 @@
 
                if( $this->data['isBetaGroupMember'] && $jQuerySupport ) {
                        $betajs = <<<HTML
-                       
{$startScriptTag}{$javaScriptPath}references.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag}
+                       
{$startScriptTag}{$javaScriptPath}references.{$resourceSuffix}js{$endScriptTag}
 HTML;
                } else {
                        $betajs = "";
@@ -95,10 +95,10 @@
                        </div>
                        {$this->data['footerHtml']}
                        <!--[if gt IE 9]><!-->
-                       
{$startScriptTag}{$javaScriptPath}application.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag}
-                       
{$startScriptTag}{$javaScriptPath}toggle.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag}
-                       
{$startScriptTag}{$javaScriptPath}banner.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag}
-                       
{$startScriptTag}{$javaScriptPath}{$betaPrefix}opensearch.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag}
+                       
{$startScriptTag}{$javaScriptPath}application.{$resourceSuffix}js{$endScriptTag}
+                       
{$startScriptTag}{$javaScriptPath}toggle.{$resourceSuffix}js{$endScriptTag}
+                       
{$startScriptTag}{$javaScriptPath}banner.{$resourceSuffix}js{$endScriptTag}
+                       
{$startScriptTag}{$javaScriptPath}{$betaPrefix}opensearch.{$resourceSuffix}js{$endScriptTag}
                        {$betajs}
                        {$filePageScript}
                        <!--[endif]-->


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

Reply via email to