[Mapbender-commits] r5340 - in trunk/mapbender: conf http/frames http/javascripts

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-01-19 07:03:59 -0500 (Tue, 19 Jan 2010)
New Revision: 5340

Modified:
   trunk/mapbender/conf/mapbender.conf-dist
   trunk/mapbender/http/frames/index.php
   trunk/mapbender/http/javascripts/map.php
Log:
http://trac.osgeo.org/mapbender/ticket/588

Modified: trunk/mapbender/conf/mapbender.conf-dist
===================================================================
--- trunk/mapbender/conf/mapbender.conf-dist	2010-01-19 11:40:18 UTC (rev 5339)
+++ trunk/mapbender/conf/mapbender.conf-dist	2010-01-19 12:03:59 UTC (rev 5340)
@@ -174,6 +174,12 @@
 define("GEO_RSS_FILE", "../tmp/georss.xml");
 
 
+# --------------------------------------------
+# use jQuery from Google CDN
+# --------------------------------------------
+define("LOAD_JQUERY_FROM_GOOGLE", false);
+
+
 ###HACK for GLOBALS
 $DBSERVER=DBSERVER;
   $DB=DB;

Modified: trunk/mapbender/http/frames/index.php
===================================================================
--- trunk/mapbender/http/frames/index.php	2010-01-19 11:40:18 UTC (rev 5339)
+++ trunk/mapbender/http/frames/index.php	2010-01-19 12:03:59 UTC (rev 5340)
@@ -87,6 +87,9 @@
 <script type='text/javascript' src='../javascripts/core.php'></script>
 </head>
 <?php
+if (LOAD_JQUERY_FROM_GOOGLE) {
+	echo "<script type='text/javascript' src='http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js'></script>";
+}
 $currentApplication = new gui($gui_id);
 echo $currentApplication->toHtml();
 $mapPhpParameters = htmlentities($urlParameters, ENT_QUOTES, CHARSET)."&amp;mb_myBBOX=".$_REQUEST["mb_myBBOX"];

Modified: trunk/mapbender/http/javascripts/map.php
===================================================================
--- trunk/mapbender/http/javascripts/map.php	2010-01-19 11:40:18 UTC (rev 5339)
+++ trunk/mapbender/http/javascripts/map.php	2010-01-19 12:03:59 UTC (rev 5340)
@@ -55,10 +55,11 @@
 // Load external JavaScript libraries
 //
 $extPath = dirname(__FILE__) . "/../extensions/";
-$extFileArray = array(
-	"jquery-ui-1.7.2.custom/js/jquery-1.3.2.min.js", 
-	"jqjson.min.js" 
-);
+$extFileArray = array();
+if (!LOAD_JQUERY_FROM_GOOGLE) {
+	$extFileArray[]= "jquery-ui-1.7.2.custom/js/jquery-1.3.2.min.js";
+}
+$extFileArray[]= "jqjson.min.js";
 
 for ($i = 0; $i < count($extFileArray); $i++) {
 	$currentFile = $extPath . $extFileArray[$i];