--

webjetclouds-agency · Aug 15, 2017 · b4a20a2 · b4a20a2
1 parent 53198a1
commit b4a20a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 31 deletions.
diff --git a/mod_opensource-joomla.zip b/mod_opensource-joomla.zip
diff --git a/mod_opensource.xml b/mod_opensource.xml
@@ -340,9 +340,8 @@
 					label="Map"
 					description="Version">
 						<option value="0">JFIELD_MOD_OPENSOURCE_HIDE</option>
-						<option value="1">mapbox.com v0.37.0 GL (CDN minified) </option>
-						<option value="2">mapbox.com v3.1.1 (CDN minified) </option>
-						<option value="3">mapbox.com v3.0.1/GeoJson URL external (CDN minified) </option>
+						<option value="1">mapbox.com v3.1.1/GeoJson URL external (CDN minified) </option>
+						<option value="1">mapbox.com v3.0.1/GeoJson URL external (custom) </option>
 				</field>
 				<field 
 					name="cookiesEU-site"

diff --git a/tmpl/default.php b/tmpl/default.php
@@ -240,8 +240,8 @@
 					$docs->addStyleSheet( 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css' ); 
 				break;
 				case 2: 
-					if($html4or5_config == 0): $docs->addScript( 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js' );  else : echo "\n".'<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3./js/bootstrap.min.js"></script>'; endif;
-					$docs->addStyleSheet( 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3./css/bootstrap.min.css' ); 
+					if($html4or5_config == 0): $docs->addScript( 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js' );  else : echo "\n".'<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>'; endif;
+					$docs->addStyleSheet( 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css' ); 
 				break;
 				case 3: 
 					if($html4or5_config == 0): $docs->addScript( 'https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.6/js/bootstrap.min.js' );  else : echo "\n".'<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.0.0-alpha.6/js/bootstrap.min.js"></script>'; endif;
@@ -441,38 +441,20 @@
 			switch($mapbox_site):
 				case 1: 
 					if($html4or5_config == 0): 
-						$docs->addScript('//api.mapbox.com/mapbox.js/v2.4.0/mapbox.js' );  
-						$docs->addStyleSheet('//api.mapbox.com/mapbox.js/v2.4.0/mapbox.css'); 
+						$docs->addScript('https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js' );  
+						$docs->addStyleSheet('https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css'); 
 					else : 
-						echo "\n".'<script src="https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.js"></script>'; 
-						$docs->addStyleSheet('//api.mapbox.com/mapbox.js/v2.4.0/mapbox.css'); 
+						echo "\n".'<script src="https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.js"></script>'; 
+						$docs->addStyleSheet('https://api.mapbox.com/mapbox.js/v3.1.1/mapbox.css'); 
 					endif;
 				break;
 				case 2: 
 					if($html4or5_config == 0): 
-						$docs->addScript('http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js' );  
-						$docs->addStyleSheet('http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css'); 
+						$docs->addScript('https://api.tiles.mapbox.com/mapbox-gl-js/v0.39.1/mapbox-gl.js' );  
+						$docs->addStyleSheet('https://api.tiles.mapbox.com/mapbox-gl-js/v0.39.1/mapbox-gl.css'); 
 					else : 
-						echo "\n".'<script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>'; 
-						$docs->addStyleSheet('http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css'); 
-					endif;
-				break;
-				case 3: 
-					if($html4or5_config == 0): 
-						$docs->addScriptVersion($own_cdn.'/mapbox/leaflet.js');  
-						$docs->addStyleSheetVersion($own_cdn.'/mapbox/leaflet.css'); 
-					else : 
-						echo "\n".'<script src="'.$own_cdn.'/mapbox/leaflet.js"></script>'; 
-						$docs->addStyleSheetVersion($own_cdn.'/mapbox/leaflet.css'); 
-					endif;
-				break;
-				case 4: 
-					if($html4or5_config == 0): 
-						$docs->addScriptVersion($own_cdn.'/mapbox/leaflet-src.js'); 
-						$docs->addStyleSheetVersion($own_cdn.'/mapbox/leaflet.min.css'); 
-					else : 
-						echo "\n".'<script src="'.$own_cdn.'/mapbox/leaflet-src.js"></script>'; 
-						$docs->addStyleSheetVersion($own_cdn.'/mapbox/leaflet.min.css'); 
+						echo "\n".'<script src="https://api.tiles.mapbox.com/mapbox-gl-js/v0.39.1/mapbox-gl.js"></script>'; 
+						$docs->addStyleSheet('https://api.tiles.mapbox.com/mapbox-gl-js/v0.39.1/mapbox-gl.css'); 
 					endif;
 				break;
 			endswitch;