update to leafletjs 2.1.0

version 2.1.0
akuechl · Dec 1, 2015 · 7f7f7d7 · 7f7f7d7
1 parent b035522
commit 7f7f7d7
Show file tree

Hide file tree

Showing 8 changed files with 7,590 additions and 7,585 deletions.
diff --git a/Osm_akuechler.php b/Osm_akuechler.php
@@ -72,11 +72,11 @@ function _addLeafletScripts() {
         $document = & JFactory::getDocument ();
 
         if ($this->params->get ( 'cdn-usage', $this->cdnUsage ) == 1) {
-            $document->addStyleSheet ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css' );
-            $document->addScript ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js' );
+            $document->addStyleSheet ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.css' );
+            $document->addScript ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.7/leaflet.js' );
         } else if ($this->params->get ( 'cdn-usage', $this->cdnUsage ) == 2) {
-            $document->addStyleSheet ( '//cdn.jsdelivr.net/leaflet/0.7.3/leaflet.css' );
-            $document->addScript ( '//cdn.jsdelivr.net/leaflet/0.7.3/leaflet.js' );
+            $document->addStyleSheet ( '//cdn.jsdelivr.net/leaflet/0.7.7/leaflet.css' );
+            $document->addScript ( '//cdn.jsdelivr.net/leaflet/0.7.7/leaflet.js' );
         } else {
             $document->addStyleSheet ( 'plugins/content/Osm_akuechler/leaflet/leaflet.css' );
             $document->addScript ( 'plugins/content/Osm_akuechler/leaflet/leaflet.js' );

diff --git a/Osm_akuechler.xml b/Osm_akuechler.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension version="2.5" type="plugin" group="content" method="upgrade">
   <name>OSM Plugin</name>
-  <creationDate>May 13, 2015</creationDate>
+  <creationDate>Dec 1st, 2015</creationDate>
   <author>Ariel Küchler</author>
   <authorUrl>https://github.com/admiralsmaster</authorUrl>
   <copyright>Ariel Küchler</copyright>
@@ -14,6 +14,11 @@
         <p>see <a href="https://github.com/admiralsmaster/osm_akuechler">https://github.com/admiralsmaster/osm_akuechler</a></p>
 	    <h2>Versions</h2>
         <ol>
+        <li>2.1.0
+        	<ul>
+        	<li>leafletjs upgrade to <a href="https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#077-october-26-2015">0.7.7</a></li>
+        	</ul>
+        </li>
         <li>2.0.0
         	<ul>
         	<li>Change the API. Now you can use HTML-Tags only.</li>

diff --git a/README.md b/README.md
@@ -51,6 +51,7 @@ height 	| The height of DIV is the height of the card. Set the height via CSS,
 Version
 --------------
 
+* **Version 2.1.0**: (Dec 1, 2015) update leafletjs to 0.7.7
 * **Version 2.0.0**: (May 13, 2015) Change the API. Now you can use HTML-Tags only.
 * **Version 1.3.0**: (November 25, 2014) add support for [jsdelivr](http://www.jsdelivr.com/)
 * **Version 1.2.0**: (July 27, 2014) leafletjs upgrade to 0.7.3, Support Interaction Options from leaflet, Fix default value for retina support

diff --git a/build.xml b/build.xml
@@ -1,12 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <project name="" default="all" basedir=".">
 
-	<property name="version" value="2.0.0" />
+	<property name="version" value="2.1.0" />
 	<property name="pluginname" value="Osm_akuechler" />
 	<property name="dist-folder" value="dist" />
 	<property name="build-folder" value="${dist-folder}/build" />
 	<property name="yui-url" value="https://repo1.maven.org/maven2/com/yahoo/platform/yui/yuicompressor/2.4.8/yuicompressor-2.4.8.jar"/>
 
+	<!--
+	<property name="proxy.port" value="8080"/>
+	<property name="proxy.host" value="proxy"/>
+	<property name="proxy.user" value=""/>
+	<property name="proxy.pass" value=""/>
+	<setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+	      proxyuser="${proxy.user}" proxypassword="${proxy.pass}"/>
+	-->
+
 	<target name="clean">
 		<delete dir="${dist-folder}" />
 		<delete dir="${build-folder}" />