diff options
| author | Jon Dufresne <jon.dufresne@gmail.com> | 2019-12-11 00:49:54 -0800 |
|---|---|---|
| committer | Carlton Gibson <carlton.gibson@noumenal.es> | 2019-12-11 09:49:54 +0100 |
| commit | e703b93a656b78b9b444bb3a9980e305ed002a70 (patch) | |
| tree | a97f9a7da09ddf36b2f4886b4b5680f1144faf0e /django | |
| parent | d8e233352877c37c469687287e7761e05bdae94e (diff) | |
Fixed #31080 -- Removed redundant type="text/javascript" attribute from <script> tags.
Diffstat (limited to 'django')
11 files changed, 13 insertions, 16 deletions
diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 4b3bfb920c..e2cacf88ef 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -3,7 +3,7 @@ {% load admin_urls %} {% block extrahead %}{{ block.super }} -<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> +<script src="{% url 'admin:jsi18n' %}"></script> {% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}">{% endblock %} {% block bodyclass %}{{ block.super }} {{ opts.app_label }}-{{ opts.model_name }} change-form{% endblock %} diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 1d749f25d3..f99936d21f 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -2,7 +2,7 @@ {% load i18n admin_urls static admin_modify %} {% block extrahead %}{{ block.super }} -<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> +<script src="{% url 'admin:jsi18n' %}"></script> {{ media }} {% endblock %} @@ -64,8 +64,7 @@ {% block submit_buttons_bottom %}{% submit_row %}{% endblock %} {% block admin_change_form_document_ready %} - <script type="text/javascript" - id="django-admin-form-add-constants" + <script id="django-admin-form-add-constants" src="{% static 'admin/js/change_form.js' %}" {% if adminform and add %} data-model-name="{{ opts.model_name }}" diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 768e581d1e..e0dc285924 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -8,7 +8,7 @@ <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}"> {% endif %} {% if cl.formset or action_form %} - <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> + <script src="{% url 'admin:jsi18n' %}"></script> {% endif %} {{ media.css }} {% if not actions_on_top and not actions_on_bottom %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index d9e41717a0..4a1c065cb2 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -4,7 +4,7 @@ {% block extrahead %} {{ block.super }} {{ media }} - <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script> + <script src="{% static 'admin/js/cancel.js' %}"></script> {% endblock %} {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation{% endblock %} diff --git a/django/contrib/admin/templates/admin/delete_selected_confirmation.html b/django/contrib/admin/templates/admin/delete_selected_confirmation.html index ce5b163869..bab4cd31c2 100644 --- a/django/contrib/admin/templates/admin/delete_selected_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_selected_confirmation.html @@ -4,7 +4,7 @@ {% block extrahead %} {{ block.super }} {{ media }} - <script type="text/javascript" src="{% static 'admin/js/cancel.js' %}"></script> + <script src="{% static 'admin/js/cancel.js' %}"></script> {% endblock %} {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} delete-confirmation delete-selected-confirmation{% endblock %} diff --git a/django/contrib/admin/templates/admin/popup_response.html b/django/contrib/admin/templates/admin/popup_response.html index 303960ff5d..509a81a7c2 100644 --- a/django/contrib/admin/templates/admin/popup_response.html +++ b/django/contrib/admin/templates/admin/popup_response.html @@ -2,8 +2,7 @@ <html> <head><title>{% trans 'Popup closing…' %}</title></head> <body> - <script type="text/javascript" - id="django-admin-popup-response-constants" + <script id="django-admin-popup-response-constants" src="{% static "admin/js/popup_response.js" %}" data-popup-response="{{ popup_response_data }}"> </script> diff --git a/django/contrib/admin/templates/admin/prepopulated_fields_js.html b/django/contrib/admin/templates/admin/prepopulated_fields_js.html index 157233993f..bbe1916fe3 100644 --- a/django/contrib/admin/templates/admin/prepopulated_fields_js.html +++ b/django/contrib/admin/templates/admin/prepopulated_fields_js.html @@ -1,6 +1,5 @@ {% load l10n static %} -<script type="text/javascript" - id="django-admin-prepopulated-fields-constants" +<script id="django-admin-prepopulated-fields-constants" src="{% static "admin/js/prepopulate_init.js" %}" data-prepopulated-fields="{{ prepopulated_fields_json }}"> </script> diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 56bb50b0bf..cc9bea3efd 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -25,7 +25,7 @@ <![endif]--> {% endblock %} <span id="{{ id }}_admin_map"> -<script type="text/javascript"> +<script> //<![CDATA[ {% block openlayers %}{% include "gis/admin/openlayers.js" %}{% endblock %} //]]> @@ -36,5 +36,5 @@ {% endif %} {% if display_wkt %}<p>{% trans "WKT debugging window:" %} </p>{% endif %} <textarea id="{{ id }}" class="vWKTField required" cols="150" rows="10" name="{{ name }}">{{ wkt }}</textarea> -<script type="text/javascript">{% block init_function %}{{ module }}.init();{% endblock %}</script> +<script>{% block init_function %}{{ module }}.init();{% endblock %}</script> </span> diff --git a/django/contrib/gis/templates/gis/openlayers.html b/django/contrib/gis/templates/gis/openlayers.html index 5455a7d633..88288a3cb7 100644 --- a/django/contrib/gis/templates/gis/openlayers.html +++ b/django/contrib/gis/templates/gis/openlayers.html @@ -12,7 +12,7 @@ {% if not disabled %}<span class="clear_features"><a href="javascript:{{ module }}.clearFeatures()">{% trans "Delete all Features" %}</a></span>{% endif %} {% if display_raw %}<p>{% trans "Debugging window (serialized value)" %}</p>{% endif %} <textarea id="{{ id }}" class="vSerializedField required" cols="150" rows="10" name="{{ name }}">{{ serialized }}</textarea> - <script type="text/javascript"> + <script> {% block map_options %}var map_options = {};{% endblock %} {% block base_layer %} var base_layer = new ol.layer.Tile({ diff --git a/django/forms/widgets.py b/django/forms/widgets.py index d83d63c169..338d54d72f 100644 --- a/django/forms/widgets.py +++ b/django/forms/widgets.py @@ -80,7 +80,7 @@ class Media: def render_js(self): return [ format_html( - '<script type="text/javascript" src="{}"></script>', + '<script src="{}"></script>', self.absolute_path(path) ) for path in self._js ] diff --git a/django/views/templates/technical_500.html b/django/views/templates/technical_500.html index 6a8ea005b2..b01b00c8e6 100644 --- a/django/views/templates/technical_500.html +++ b/django/views/templates/technical_500.html @@ -63,7 +63,7 @@ .append-bottom { margin-bottom: 10px; } </style> {% if not is_email %} - <script type="text/javascript"> + <script> function hideAll(elems) { for (var e = 0; e < elems.length; e++) { elems[e].style.display = 'none'; |
