Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
Fix Bug 1450646, remove type attribute from script tags
Browse files Browse the repository at this point in the history
  • Loading branch information
schalkneethling committed Apr 17, 2018
1 parent 195696d commit e04bd03
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 37 deletions.
2 changes: 1 addition & 1 deletion jinja2/403.html
Expand Up @@ -77,7 +77,7 @@ <h1 class="page-title">{% block page_title %}{{ _('Permission Denied') }}{% endb
{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
mdn.analytics.trackError('403', String(window.location));
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion jinja2/404.html
Expand Up @@ -57,7 +57,7 @@ <h1>{{_('Not Found')}}</h1>
{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
mdn.analytics.trackError('404', String(window.location));
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion jinja2/429.html
Expand Up @@ -57,7 +57,7 @@ <h1 class="page-title">{{ _('Too Many Requests') }}</h1>
{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
mdn.analytics.trackError('429', String(window.location));
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion jinja2/base.html
Expand Up @@ -185,7 +185,7 @@ <h2 class="footer-title">Mozilla</h2>
<!--[if lte IE 8]>{% javascript 'selectivizr' %}<![endif]-->

{{ providers_media_js() }}
<script type="text/javascript" src="{{ statici18n(request.LANGUAGE_CODE) }}"></script>
<script src="{{ statici18n(request.LANGUAGE_CODE) }}"></script>
{% javascript 'main' %}
<script>
if (window.mdn && mdn.analytics) mdn.analytics.trackOutboundLinks();
Expand Down
2 changes: 1 addition & 1 deletion jinja2/includes/config.html
@@ -1,4 +1,4 @@
<script type="text/javascript">
<script>
// make sure global mdn object exists
var mdn = window.mdn || {};

Expand Down
2 changes: 1 addition & 1 deletion jinja2/includes/google_analytics.html
@@ -1,6 +1,6 @@
{% if config.GOOGLE_ANALYTICS_ACCOUNT != '0' %}
{% set GA_FILE = 'analytics_debug' if settings.DEBUG else 'analytics' %}
<script type="text/javascript">
<script>
// only load GA if DNT is not enabled
if (Mozilla && !Mozilla.dntEnabled()) {
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
Expand Down
30 changes: 15 additions & 15 deletions kuma/landing/jinja2/landing/promote_buttons.html
Expand Up @@ -24,13 +24,13 @@ <h2>{{ _('Spread some developer love.') }}</h2>
<li><strong>Feel Good:</strong> Take pride in knowing you're making developers lives just a little bit better by sharing MDN with the world.</li>
</ol>
{% endtrans %}
</div>
</div>
</header>

<section id="content-main" class="full" role="main">

<form id="button-builder">

<div id="button-preview" class="boxed">
<h3>{{_('Preview')}}</h3>
<div><img id="button-image" src="" width="120" height="240" alt="" /></div>
Expand Down Expand Up @@ -71,7 +71,7 @@ <h3>{{_('Choose a color')}}</h3>
<ul>
<li class="gray">
<label for="button-color-gray">
<input id="button-color-gray" name="button-color" type="radio" value="Gray" />
<input id="button-color-gray" name="button-color" type="radio" value="Gray" />
{{_('Gray')}}
</label>
</li>
Expand Down Expand Up @@ -130,7 +130,7 @@ <h4>{{_('Your button will take people to:')}}</h4>

</form>
</div>

</section><!-- /#content-main -->

</div>
Expand All @@ -139,7 +139,7 @@ <h4>{{_('Your button will take people to:')}}</h4>
{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
// <![CDATA[

function rowsToObjects (col_names, rows) {
Expand Down Expand Up @@ -208,7 +208,7 @@ <h4>{{_('Your button will take people to:')}}</h4>
var was_visible = $(sel).is(':visible');
$(sel).fadeIn('fast', function() {
if (!was_visible) {
$("html,body").animate({scrollTop: $(sel).offset().top}, 500);
$("html,body").animate({scrollTop: $(sel).offset().top}, 500);
}
});
}
Expand All @@ -234,14 +234,14 @@ <h4>{{_('Your button will take people to:')}}</h4>
} else {
$('#step-topic').hide();
}

if ( spec['design'] === 'Web Developer Toolbox' ) {
$("#step-code h3 b").text("3");
}
else {
$("#step-code h3 b").text("4");
}

$('#step-topic ul').removeClass();
$('#step-topic ul').addClass(spec['color']);

Expand All @@ -252,7 +252,7 @@ <h4>{{_('Your button will take people to:')}}</h4>
var found = true;
for (var k in spec) if (spec.hasOwnProperty(k)) {
// Accept --- or selector value as column match.
if ('---' != item[k] && spec[k] != item[k]) {
if ('---' != item[k] && spec[k] != item[k]) {
found = false; break;
}
}
Expand Down Expand Up @@ -293,25 +293,25 @@ <h4>{{_('Your button will take people to:')}}</h4>

$('#button-builder input:radio').click(function(){
$(this).parents('ul').children('li').removeClass('selected');
$(this).parents('li').addClass('selected');
$(this).parents('li').addClass('selected');
});
$('#button-builder input:radio:checked').parents('li').addClass('selected');


// Update the button code on any change to selectors.
$('#button-builder input:radio').click(updateButtonCode);
$('#button-builder select').change(updateButtonCode);

// Do an initial code update on page ready.
$(document).ready(function () {
updateButtonCode();
});

// Redirect clicks on topic links to radio selection.
$('#step-topic a').click(function () {
$(this).parent().prev().click();
$('#step-topic a').click(function () {
$(this).parent().prev().click();
updateButtonCode();
return false;
return false;
});

// Focusing on the code textarea selects all for copypasta
Expand Down
Expand Up @@ -7,7 +7,7 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">
<script>

function gup( name )
{
Expand Down
Expand Up @@ -7,7 +7,7 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">
<script>

function doLoadScript( url )
{
Expand Down
Expand Up @@ -7,7 +7,7 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">
<script>

function gup( name )
{
Expand Down
Expand Up @@ -7,7 +7,7 @@
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<script type="text/javascript">
<script>

function doLoadScript( url )
{
Expand Down
2 changes: 1 addition & 1 deletion kuma/users/jinja2/account/email.html
Expand Up @@ -66,7 +66,7 @@ <h2>{{ _("Add email address") }}</h2>

{% block js %}
{{ super() }}
<script type="text/javascript">
<script>
(function() {
var message = "{{ _("Do you really want to remove the selected email address?") }}";
var actions = document.getElementsByName('action_remove');
Expand Down
2 changes: 1 addition & 1 deletion kuma/users/jinja2/account/password_reset.html
Expand Up @@ -25,7 +25,7 @@ <h1>{{ _("Password Reset") }}</h1>

{% block js %}
{{ super() }}
<script type="text/javascript">
<script>
$("#id_email").focus();
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion kuma/users/jinja2/users/user_edit.html
Expand Up @@ -143,7 +143,7 @@ <h3>Unsubscribe</h3>
{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
// <![CDATA[
var INTEREST_SUGGESTIONS = {{ INTEREST_SUGGESTIONS|jsonencode }};
// ]]>
Expand Down
2 changes: 1 addition & 1 deletion kuma/wiki/jinja2/403-create-page.html
Expand Up @@ -33,7 +33,7 @@
{% block next_action %}{% endblock %}

{% block js %}
<script type="text/javascript">
<script>
mdn.analytics.trackError('403', String(window.location), 'create-page');
</script>
{% endblock %}
2 changes: 1 addition & 1 deletion kuma/wiki/jinja2/wiki/code_sample.html
Expand Up @@ -13,7 +13,7 @@
{{ html|safe }}
{% endif %}
{% if js %}
<script type="text/javascript">
<script>
{{ js|safe }}
</script>
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion kuma/wiki/jinja2/wiki/document.html
Expand Up @@ -311,7 +311,7 @@ <h2 class="offscreen">{{ _('Document Tags and Contributors') }}</h2>
{% block js %}

{% if waffle.flag('section_edit') %}
<script type="text/javascript">
<script>
(function($) {
$('#wikiArticle').children('h2[id]').each(function() {
var id = $(this).attr('id');
Expand Down
4 changes: 2 additions & 2 deletions kuma/wiki/jinja2/wiki/edit.html
Expand Up @@ -212,7 +212,7 @@ <h3><i aria-hidden="true" class="icon-tags"></i>{{ _('Tags') }} <a href="{{ wiki
{% include 'attachments/includes/attachment_list.html' %}

<!-- Add information about this document in JSON format for use in CKEditor -->
<script type="text/javascript">
<script>
mdn.wiki.document = {{ document.get_json_data()|tojson }};
</script>

Expand All @@ -227,7 +227,7 @@ <h3><i aria-hidden="true" class="icon-tags"></i>{{ _('Tags') }} <a href="{{ wiki
{% include 'wiki/includes/tag_suggestions.html' %}

{% include 'wiki/includes/ckeditor_scripts.html' %}
<script type="text/javascript">
<script>
if(window.waffle.flag_is_active('section_edit')) CKEDITOR.on('instanceReady', function(evt) {
var hash = window.location.hash.replace('#', '');
if(!hash) return;
Expand Down
2 changes: 1 addition & 1 deletion kuma/wiki/jinja2/wiki/includes/tag_suggestions.html
@@ -1,4 +1,4 @@
{% set suggestions = config.WIKI_DOCUMENT_TAG_SUGGESTIONS or '[]' %}
<script type="text/javascript">
<script>
mdn.wiki.tagSuggestions = {{ suggestions|safe }};
</script>
2 changes: 1 addition & 1 deletion kuma/wiki/jinja2/wiki/list/revisions.html
Expand Up @@ -98,7 +98,7 @@ <h1>{{ _('History of') }} <a href="{{ document.get_absolute_url() }}">{{ documen
{{ super() }}
{% javascript 'framebuster' %}

<script type="text/javascript">
<script>
$(document).ready(function() {
var $pagination = $('.pagination');
var $next = $pagination.find('.next');
Expand Down
2 changes: 1 addition & 1 deletion kuma/wiki/tests/test_views_code.py
Expand Up @@ -53,7 +53,7 @@ def test_code_sample(code_sample_doc, constance_config, client, settings):
' rel="stylesheet" type="text/css">'
'<style type="text/css">.some-css { color: red; }</style>'
'Some HTML'
'<script type="text/javascript">window.alert("HI THERE")</script>'
'<script>window.alert("HI THERE")</script>'
% settings.STATIC_URL)
assert normalized == expected

Expand Down
2 changes: 1 addition & 1 deletion media/maintenance/index.html
Expand Up @@ -6,7 +6,7 @@
<link href="//mozorg.cdn.mozilla.net/media/css/tabzilla-min.css" rel="stylesheet">
<link rel="shortcut icon" href="/media/maintenance/img/favicon32.png">
<link rel="stylesheet" href="/media/maintenance/css/maintenance.css">
<script type="text/javascript">
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
Expand Down

0 comments on commit e04bd03

Please sign in to comment.