Drop 1st class support for IE9 (Fixes mozilla#7559)

alexgibson · Aug 23, 2019 · 69755f3 · 69755f3
1 parent 8ef08a4
commit 69755f3
Show file tree

Hide file tree

Showing 23 changed files with 203 additions and 277 deletions.
diff --git a/bedrock/base/templates/base-article.html b/bedrock/base/templates/base-article.html
@@ -40,7 +40,7 @@
 
 {% block site_js %}
   {{ super() }}
-  <!--[if !lte IE 8]><!-->
+  <!--[if !IE]><!-->
     {{ js_bundle('basic-article') }}
   <!--<![endif]-->
 {% endblock %}

diff --git a/bedrock/base/templates/base-pebbles.html b/bedrock/base/templates/base-pebbles.html
@@ -9,7 +9,7 @@
 
     {{ js_bundle('site') }}
 
-    <!--[if !lte IE 8]><!-->
+    <!--[if !IE]><!-->
     {% block experiments %}{% endblock %}
     <!--<![endif]-->
 
@@ -50,28 +50,28 @@
 
     {{ l10n_css() }}
 
-    <!--[if lte IE 8]>
+    <!--[if IE]>
       {# Only needed for IE before v9 #}
       <script src="{{ static('js/libs/html5shiv.js') }}"></script>
 
-      {# Basic styles, only for IE8 and lower #}
+      {# Basic styles, only for IE9 and lower #}
       {% block old_ie_styles %}
       {{ css_bundle('oldIE-pebbles') }}
       {% endblock %}
     <![endif]-->
 
-    <!--[if !lte IE 8]><!-->
-    {# Global styles, hidden from IE8 and lower #}
+    <!--[if !IE]><!-->
+    {# Global styles, hidden from IE9 and lower #}
     {% block site_css %}
       {{ css_bundle('pebbles') }}
     {% endblock %}
 
-    {# Page-specific styles, hidden from IE8 and lower #}
+    {# Page-specific styles, hidden from IE9 and lower #}
     {% block page_css %}{% endblock %}
     <!--<![endif]-->
 
     {% block extrahead %}
-      {# Extra header stuff (scripts, styles, metadata, etc) seen by all browsers. Use the 'page_css' block for CSS you want to hide from IE7 and lower. #}
+      {# Extra header stuff (scripts, styles, metadata, etc) seen by all browsers. Use the 'page_css' block for CSS you want to hide from IE9 and lower. #}
     {% endblock %}
 
     {% block js_pretrack %}{# include JavaScript that must be run pre GA tracking here #}{% endblock %}
@@ -91,29 +91,25 @@
       data-global-fx-out-of-date-banner-confirm="{{ _('Update Firefox') }}"
       {% block string_data %}{% endblock %}></div>
 
-  {% block site_header %}
-    {% include 'includes/protocol/navigation/index.html' %}
-  {% endblock %}
-
-  <div id="outer-wrapper">
-    {% block content %}{% endblock %}
-
-    {% block site_footer %}
-      {% include 'includes/site-footer.html' %}
+    {% block site_header %}
+      {% include 'includes/protocol/navigation/index.html' %}
     {% endblock %}
-  </div>
 
-  <!--[if IE 9]>
-    {{ js_bundle('matchmedia') }}
-  <![endif]-->
+    <div id="outer-wrapper">
+      {% block content %}{% endblock %}
+
+      {% block site_footer %}
+        {% include 'includes/site-footer.html' %}
+      {% endblock %}
+    </div>
 
     {% block site_js %}
-      <!--[if !lte IE 8]><!-->
+      <!--[if !IE]><!-->
         {{ js_bundle('common') }}
       <!--<![endif]-->
 
-      <!--[if lte IE 8]>
-        {{ js_bundle('common-ie8') }}
+      <!--[if IE]>
+        {{ js_bundle('common-ie') }}
       <![endif]-->
     {% endblock %}
 
@@ -124,7 +120,7 @@
       {% endif %}
     {% endblock %}
 
-    <!--[if !lte IE 8]><!-->
+    <!--[if !IE]><!-->
     {% block js %}{% endblock %}
 
     {# Bug 1381776 #}

diff --git a/bedrock/base/templates/base-protocol.html b/bedrock/base/templates/base-protocol.html
@@ -13,12 +13,12 @@
 {% endblock %}
 
 {% block site_js %}
-<!--[if !lte IE 8]><!-->
+<!--[if !IE]><!-->
   {{ js_bundle('common-protocol') }}
 <!--<![endif]-->
 
-<!--[if lte IE 8]>
-  {{ js_bundle('common-ie8') }}
+<!--[if IE]>
+  {{ js_bundle('common-ie') }}
 <![endif]-->
 {% endblock %}
 

diff --git a/bedrock/base/templates/base-resp.html b/bedrock/base/templates/base-resp.html
@@ -9,7 +9,7 @@
 
     {{ js_bundle('site') }}
 
-    <!--[if !lte IE 8]><!-->
+    <!--[if !IE]><!-->
     {% block experiments %}{% endblock %}
     <!--<![endif]-->
 
@@ -50,26 +50,26 @@
 
     {{ l10n_css() }}
 
-    <!--[if lte IE 8]>
+    <!--[if IE]>
       {# Only needed for IE before v9 #}
       <script src="{{ static('js/libs/html5shiv.js') }}"></script>
 
-      {# Basic styles, only for IE8 and lower #}
+      {# Basic styles, only for IE9 and lower #}
       {{ css_bundle('oldIE') }}
     <![endif]-->
 
-    <!--[if !lte IE 8]><!-->
-    {# Global styles, hidden from IE8 and lower #}
+    <!--[if !IE]><!-->
+    {# Global styles, hidden from IE9 and lower #}
     {% block site_css %}
       {{ css_bundle('responsive') }}
     {% endblock %}
 
-    {# Page-specific styles, hidden from IE8 and lower #}
+    {# Page-specific styles, hidden from IE9 and lower #}
     {% block page_css %}{% endblock %}
     <!--<![endif]-->
 
     {% block extrahead %}
-      {# Extra header stuff (scripts, styles, metadata, etc) seen by all browsers. Use the 'page_css' block for CSS you want to hide from IE8 and lower. #}
+      {# Extra header stuff (scripts, styles, metadata, etc) seen by all browsers. Use the 'page_css' block for CSS you want to hide from IE9 and lower. #}
     {% endblock %}
 
     {% block js_pretrack %}{# include JavaScript that must be run pre GA tracking here #}{% endblock %}
@@ -127,17 +127,13 @@
 
     </div><!-- close #outer-wrapper -->
 
-    <!--[if IE 9]>
-      {{ js_bundle('matchmedia') }}
-    <![endif]-->
-
     {% block site_js %}
-      <!--[if !lte IE 8]><!-->
+      <!--[if !IE]><!-->
         {{ js_bundle('common') }}
       <!--<![endif]-->
 
-      <!--[if lte IE 8]>
-        {{ js_bundle('common-ie8') }}
+      <!--[if IE]>
+        {{ js_bundle('common-ie') }}
       <![endif]-->
     {% endblock %}
 
@@ -148,7 +144,7 @@
       {% endif %}
     {% endblock %}
 
-    <!--[if !lte IE 8]><!-->
+    <!--[if !IE]><!-->
     {% block js %}{% endblock %}
 
     {# Bug 1381776 #}

diff --git a/bedrock/firefox/templates/firefox/election/index.html b/bedrock/firefox/templates/firefox/election/index.html
@@ -19,7 +19,7 @@
 {% block body_class %}election{% endblock %}
 
 {% block extrahead %}
-<!--[if lt IE 10]>
+<!--[if IE]>
   <style>
     /* avoid IE9 background calc() bug */
     .mzp-c-hero.mzp-has-image {

diff --git a/bedrock/firefox/templates/firefox/fights-for-you.de.html b/bedrock/firefox/templates/firefox/fights-for-you.de.html
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block extrahead %}
-<!--[if lt IE 10]>
+<!--[if IE]>
   <style>
     /* avoid IE9 background calc() bug */
     .fffy-c-hero,

diff --git a/bedrock/firefox/templates/firefox/fights-for-you.fr.html b/bedrock/firefox/templates/firefox/fights-for-you.fr.html
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block extrahead %}
-<!--[if lt IE 10]>
+<!--[if IE]>
   <style>
     /* avoid IE9 background calc() bug */
     .fffy-c-hero,

diff --git a/bedrock/firefox/templates/firefox/fights-for-you.html b/bedrock/firefox/templates/firefox/fights-for-you.html
@@ -18,7 +18,7 @@
 {% endblock %}
 
 {% block extrahead %}
-<!--[if lt IE 10]>
+<!--[if IE]>
   <style>
     /* avoid IE9 background calc() bug */
     .fffy-c-hero,

diff --git a/bedrock/firefox/templates/firefox/home/index.html b/bedrock/firefox/templates/firefox/home/index.html
@@ -21,6 +21,12 @@
   {{ css_bundle('firefox-home') }}
 {% endblock %}
 
+{% block extrahead %}
+  <!--[if IE 9]><!-->
+    {{ css_bundle('firefox-home-ie9') }}
+  <!--<![endif]-->
+{% endblock %}
+
 {% block body_id %}firefox-home{% endblock %}
 {% block body_attrs %}{% if variation %}data-variant="{{ variation }}"{% endif %}{% endblock %}
 
@@ -85,7 +91,7 @@ <h3>{{ _('Faster Page Loading') }}</h3>
         </li>
       </ul>
 
-      <div class="privacy-section-media">
+      <div class="privacy-section-media is-js-dependent">
         {{ lazy_img(image_url='firefox/home/private-browsing.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '502', 'height': '325'}) }}
         {{ lazy_img(image_url='firefox/home/tracking-protection.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '503', 'height': '305'}) }}
       </div>
@@ -112,7 +118,7 @@ <h2 class="section-title"><a href="{{ url('firefox.accounts') }}">{{ _('Sync you
         {% endif %}
       </div>
 
-      <div class="sync-section-image">
+      <div class="sync-section-image is-js-dependent">
         {{ lazy_img(image_url='firefox/home/sync.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': _('Image of Gif shared from desktop to mobile using the Send Tab feature.'), 'width': '788', 'height': '571'}) }}
       </div>
     </div>
@@ -204,7 +210,7 @@ <h2 class="section-title">{{ _('30% lighter than Chrome') }}</h2>
             {% endtrans %}
             </p>
           </div>
-          <div class="key-feature-media image">
+          <div class="key-feature-media image is-js-dependent">
             {{ lazy_img(image_url='firefox/home/less-memory.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'alt': '', 'width': '645', 'height': '400'}) }}
           </div>
         </div>
@@ -226,7 +232,7 @@ <h2 class="section-title"><a href="{{ url('firefox.switch') }}">{{ _('Moving bro
           <a href="{{ url('firefox.switch') }}">{{ _('Learn more') }}</a>
         </div>
       </div>
-      <div class="section-media">
+      <div class="section-media is-js-dependent">
         <a href="{{ url('firefox.switch') }}">
           {{ lazy_img(image_url='firefox/home/switch-to-firefox.png', placeholder_url='firefox/home/spacer.gif', include_highres_image=True, optional_attributes={'width': '643', 'height': '377'}) }}
         </a>

diff --git a/bedrock/mozorg/templates/mozorg/contribute/contribute-embed.html b/bedrock/mozorg/templates/mozorg/contribute/contribute-embed.html
@@ -12,7 +12,7 @@
 
     <title>Mozilla — {{_('Get Involved: Volunteer Opportunities at Mozilla')}} — mozilla.org</title>
 
-    <!--[if lte IE 8]>
+    <!--[if IE]>
     <script src="{{ static('js/libs/html5shiv.js') }}"></script>
     <![endif]-->
 

diff --git a/bedrock/mozorg/templates/mozorg/mpl/2.0/index.html b/bedrock/mozorg/templates/mozorg/mpl/2.0/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8" />
   <meta name="generator" content="pandoc" />
   <title>Mozilla Public License, version 2.0</title>
-  <!--[if lt IE 9]>
+  <!--[if IE]>
     <script src="{{ static('js/libs/html5shiv.js') }}"></script>
   <![endif]-->
 

diff --git a/docs/stub-attribution.rst b/docs/stub-attribution.rst
@@ -82,7 +82,7 @@ the page template where an experiment exists:
 
     {% block stub_attribution %}
       {% if settings.STUB_ATTRIBUTION_RATE %}
-        <!--[if !lte IE 8]><!-->
+        <!--[if !IE]><!-->
         {{ js_bundle('stub-attribution-custom') }}
         {{ js_bundle('my-page-experiment-script') }}
         <!--<![endif]-->