Skip to content

Commit

Permalink
Drop outdated type attribute for CSS and JS
Browse files Browse the repository at this point in the history
  • Loading branch information
claudep committed May 15, 2020
1 parent 0da4e9d commit abcf39f
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions docs/templates.rst
Expand Up @@ -14,7 +14,7 @@ The easy way :

::

<script type="text/javascript">
<script>
function map_init_basic (map, options) {
...
L.marker([50.5, 30.5]).addTo(map);
Expand All @@ -31,7 +31,7 @@ If you don't want to expose global callbacks :

::

<script type="text/javascript">
<script>
window.addEventListener("map:init", function (e) {
var detail = e.detail;
...
Expand Down Expand Up @@ -173,7 +173,7 @@ In a template:

{% block javascript %}
{{ block.super }}
<script type="text/javascript">
<script>
function map_init(map, options) {
{% include 'shared/overlays.html' %}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/widget.rst
Expand Up @@ -68,7 +68,7 @@ some custom (non-tile) overlays.

::

<script type="text/javascript">
<script>
window.addEventListener("map:init", function (event) {
var map = event.detail.map; // Get reference to map
{% include 'shared/overlays.html' %}
Expand Down
2 changes: 1 addition & 1 deletion example/mushrooms/templates/index.html
Expand Up @@ -6,7 +6,7 @@
<style>
.leaflet-container { height: 100%; }
</style>
<script type="text/javascript">
<script>
var dataurl = '{% url "data" %}';

window.addEventListener("map:init", function (event) {
Expand Down
2 changes: 1 addition & 1 deletion leaflet/templates/leaflet/_leaflet_map.html
@@ -1,7 +1,7 @@
{% load i18n %}
{% load static %}
{% if creatediv %}<div id="{{ name }}" class="leaflet-container-default"></div>{% endif %}
<script type="text/javascript">
<script>
(function () {

function loadmap() {
Expand Down
2 changes: 1 addition & 1 deletion leaflet/templates/leaflet/css.html
Expand Up @@ -3,6 +3,6 @@
<style>.leaflet-container-default {min-height: 300px;}</style>
{% if PLUGINS_CSS %}
{% for css in PLUGINS_CSS %}
<link rel="stylesheet" href="{{ css }}" type="text/css" />
<link rel="stylesheet" href="{{ css }}" />
{% endfor %}
{% endif %}
16 changes: 8 additions & 8 deletions leaflet/templates/leaflet/js.html
@@ -1,22 +1,22 @@
{% load i18n %}
{% load static %}
{% if DEBUG %}
<script src="{% static "leaflet/leaflet-src.js" %}" type="text/javascript"></script>
<script src="{% static "leaflet/leaflet-src.js" %}"></script>
{% else %}
<script src="{% static "leaflet/leaflet.js" %}" type="text/javascript"></script>
<script src="{% static "leaflet/leaflet.js" %}"></script>
{% endif %}
{% if SRID %}
<script src="{% static "leaflet/proj4js.js" %}" type="text/javascript"></script>
<script src="{% static "leaflet/proj4leaflet.js" %}" type="text/javascript"></script>
<script src="{% static "proj4js/"|add:SRID|add:".js" %}" type="text/javascript"></script>
<script src="{% static "leaflet/proj4js.js" %}"></script>
<script src="{% static "leaflet/proj4leaflet.js" %}"></script>
<script src="{% static "proj4js/"|add:SRID|add:".js" %}"></script>
{% endif %}
{% if PLUGINS_JS %}
{% for js in PLUGINS_JS %}
<script src="{{ js }}" type="text/javascript"></script>
<script src="{{ js }}"></script>
{% endfor %}
{% endif %}
<script src="{% static "leaflet/leaflet.extras.js" %}" type="text/javascript"></script>
<script type="text/javascript">
<script src="{% static "leaflet/leaflet.extras.js" %}"></script>
<script>
{% if with_forms %}{% include "leaflet/_leaflet_draw_i18n.js" %}{% endif %}
L.Control.ResetView.TITLE = "{% trans "Reset view" %}";
L.Control.ResetView.ICON = "url({% static "leaflet/images/reset-view.png" %})";
Expand Down
4 changes: 2 additions & 2 deletions leaflet/templates/leaflet/widget.html
@@ -1,13 +1,13 @@
{% load leaflet_tags l10n %}
{% load static %}

<style type="text/css">{% block map_css %}
<style>{% block map_css %}
{% if map_width and map_height %}#{{ id_map }} { width: {{ map_width|unlocalize }}; height: {{ map_height|unlocalize }}; }{% endif %}
{% if not display_raw %}#{{ id_css }} { display: none; }{% endif %}
{% endblock map_css %}
</style>

<script type="text/javascript">
<script>
{% block vars %}var {{ module }} = {};
{{ module }}.fieldid = '{{ id_css }}';
{{ module }}.modifiable = {{ modifiable|yesno:"true,false" }};
Expand Down

0 comments on commit abcf39f

Please sign in to comment.