Skip to content

Commit

Permalink
Update to Leafletjs 1.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
akuechl committed Oct 4, 2016
1 parent 0da4a98 commit 7ffd274
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 32 deletions.
10 changes: 5 additions & 5 deletions Osm_akuechler.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* @package Joomla
* @copyright Copyright (C) 2011-2014 Ariel Küchler. All rights reserved.
* @copyright Copyright (C) 2011-2016 Ariel Küchler. All rights reserved.
* @license MIT License (http://opensource.org/licenses/mit-license copyright information see above) OR GPL-3.0 (http://opensource.org/licenses/gpl-3.0)
*/
defined ( '_JEXEC' ) or die ( 'Restricted access' );
Expand Down Expand Up @@ -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/1.0.0/leaflet.css' );
$document->addScript ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.0/leaflet.js' );
$document->addStyleSheet ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.1/leaflet.css' );
$document->addScript ( '//cdnjs.cloudflare.com/ajax/libs/leaflet/1.0.1/leaflet.js' );
} else if ($this->params->get ( 'cdn-usage', $this->cdnUsage ) == 2) {
$document->addStyleSheet ( '//cdn.jsdelivr.net/leaflet/1.0.0/leaflet.css' );
$document->addScript ( '//cdn.jsdelivr.net/leaflet/1.0.0/leaflet.js' );
$document->addStyleSheet ( '//cdn.jsdelivr.net/leaflet/1.0.1/leaflet.css' );
$document->addScript ( '//cdn.jsdelivr.net/leaflet/1.0.1/leaflet.js' );
} else {
$document->addStyleSheet ( 'plugins/content/Osm_akuechler/leaflet/leaflet.css' );
$document->addScript ( 'plugins/content/Osm_akuechler/leaflet/leaflet.js' );
Expand Down
7 changes: 6 additions & 1 deletion Osm_akuechler.xml
Original file line number Diff line number Diff line change
@@ -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>Sep 27th, 2016</creationDate>
<creationDate>Oct. 4th, 2016</creationDate>
<author>Ariel Küchler</author>
<authorUrl>https://github.com/admiralsmaster</authorUrl>
<copyright>Ariel Küchler</copyright>
Expand All @@ -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.3.0
<ul>
<li>leafletjs upgrade to <a href="https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#101-september-30-2016">1.0.1</a></li>
</ul>
</li>
<li>2.2.0
<ul>
<li>leafletjs upgrade to <a href="https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md#100-september-26-2016">1.0.0</a></li>
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ height | The height of DIV is the height of the card. Set the height via CSS,
Version
--------------

* **Version 2.3.0**: (Oct 4th, 2016) update leafletjs to 1.0.1
* **Version 2.2.0**: (Sep 27, 2016) update leafletjs to 1.0.0
* **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.
Expand Down
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<project name="" default="all" basedir=".">

<property name="version" value="2.2.0" />
<property name="version" value="2.3.0" />
<property name="pluginname" value="Osm_akuechler" />
<property name="dist-folder" value="dist" />
<property name="build-folder" value="${dist-folder}/build" />
Expand Down
39 changes: 22 additions & 17 deletions leaflet/leaflet-src.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion leaflet/leaflet-src.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion leaflet/leaflet.css
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@

/* Default icon URLs */
.leaflet-default-icon-path {
background-image: url(images/);
background-image: url(images/marker-icon.png);
}


Expand Down
12 changes: 6 additions & 6 deletions leaflet/leaflet.js

Large diffs are not rendered by default.

0 comments on commit 7ffd274

Please sign in to comment.