From e37511b7607daf7625ee1e782d617b25e7bce314 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 May 2020 10:20:10 +0100 Subject: [PATCH] Update dependency prettier to v2 (#604) * Update dependency prettier to v2 * Run prettier Co-authored-by: Renovate Bot Co-authored-by: Stuart Colville --- _assets/js/basket-client.js | 6 +- _assets/js/breakpoints.js | 4 +- _assets/js/inview.js | 14 +- _assets/js/main.js | 190 +++++++++++------------ _assets/js/parallax.js | 26 ++-- _assets/js/parallaxFG.js | 4 +- _assets/js/protocol-lang-switcher-min.js | 10 +- _assets/js/protocol-lang-switcher.js | 10 +- _assets/js/tinypubsub.js | 8 +- _assets/js/youtubeplayer.js | 22 +-- package.json | 2 +- yarn.lock | 8 +- 12 files changed, 150 insertions(+), 154 deletions(-) diff --git a/_assets/js/basket-client.js b/_assets/js/basket-client.js index 62e02562..4594fca8 100644 --- a/_assets/js/basket-client.js +++ b/_assets/js/basket-client.js @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -(function() { +(function () { 'use strict'; // !! this file assumes only one signup form per page !! @@ -73,7 +73,7 @@ var xhr = new XMLHttpRequest(); - xhr.onload = function(r) { + xhr.onload = function (r) { if (r.target.status >= 200 && r.target.status < 300) { // response is null if handled by service worker if (response === null) { @@ -97,7 +97,7 @@ } }; - xhr.onerror = function(e) { + xhr.onerror = function (e) { newsletterError(e); }; diff --git a/_assets/js/breakpoints.js b/_assets/js/breakpoints.js index d9eb9add..de55d2c5 100644 --- a/_assets/js/breakpoints.js +++ b/_assets/js/breakpoints.js @@ -19,8 +19,8 @@ * -------------------------------------------------------------------- */ -(function($) { - $.fn.breakpoints = function(options) { +(function ($) { + $.fn.breakpoints = function (options) { var settings = $.extend( { matchMedia: Array( diff --git a/_assets/js/inview.js b/_assets/js/inview.js index b5a08198..4f89739a 100644 --- a/_assets/js/inview.js +++ b/_assets/js/inview.js @@ -1,4 +1,4 @@ -(function(d) { +(function (d) { if (typeof window !== 'undefined' && 'ontouchstart' in window) { console.debug('Inview disabled for touch device.'); return; @@ -12,28 +12,28 @@ f = h.documentElement, j = d.expando; d.event.special.inview = { - add: function(a) { + add: function (a) { p[a.guid + '-' + this[j]] = { data: a, $element: d(this) }; }, - remove: function(a) { + remove: function (a) { try { delete p[a.guid + '-' + this[j]]; } catch (d) {} }, }; - d(i).bind('scroll resize', function() { + d(i).bind('scroll resize', function () { e = a = null; }); !f.addEventListener && f.attachEvent && - f.attachEvent('onfocusin', function() { + f.attachEvent('onfocusin', function () { a = null; }); - setInterval(function() { + setInterval(function () { var k = d(), j, n = 0; - d.each(p, function(a, b) { + d.each(p, function (a, b) { var c = b.data.selector, d = b.$element; k = k.add(c ? d.find(c) : d); diff --git a/_assets/js/main.js b/_assets/js/main.js index 636f6eb0..1745df41 100644 --- a/_assets/js/main.js +++ b/_assets/js/main.js @@ -5,7 +5,7 @@ */ window.is_touch_device = 'ontouchstart' in document.documentElement; -jQuery(document).ready(function($) { +jQuery(document).ready(function ($) { // SETTINGS // ------------------ @@ -21,10 +21,10 @@ jQuery(document).ready(function($) { $('body').addClass('touch-device'); } - $('body').on('mousedown', function() { + $('body').on('mousedown', function () { $('body').addClass('using-mouse'); }); - $('body').on('keydown', function() { + $('body').on('keydown', function () { $('body').removeClass('using-mouse'); }); @@ -37,7 +37,7 @@ jQuery(document).ready(function($) { $('.site-header').switchNav(); } - $('.has-children').each(function() { + $('.has-children').each(function () { if ($(this).find('.is-active').length) { $(this).addClass('has-active-children'); } @@ -59,7 +59,7 @@ jQuery(document).ready(function($) { // Secondary Dropdown should not be tabbed through since it repeats functionality above: if ($('.sidenav-top a').length) { - $('.sidenav-top a').each(function() { + $('.sidenav-top a').each(function () { $(this).attr('tabindex', '-1'); }); } @@ -223,11 +223,11 @@ jQuery(document).ready(function($) { // ------------------------------------------------------------------------------------------------------------------------------------------------ // PLUGINS -(function($) { +(function ($) { // 1. Top Navigation : toggle mobile and desktop // ------ - $.fn.switchNav = function(options) { + $.fn.switchNav = function (options) { var settings = $.extend( { breakpoint: 'atleast_large', @@ -267,7 +267,7 @@ jQuery(document).ready(function($) { // 1.a Mobile Menu - $.fn.mobileMenu = function() { + $.fn.mobileMenu = function () { var $body = $('body'); var $container = this; var $nav = $container.find('.topNav'); @@ -275,7 +275,7 @@ jQuery(document).ready(function($) { $nav.velocity('transition.slideUpOut', { duration: 0, display: 'none' }); - $primaryDropdown.on('click', function(e) { + $primaryDropdown.on('click', function (e) { e.preventDefault(); if ($body.hasClass('nav-open')) { $primaryDropdown @@ -297,12 +297,12 @@ jQuery(document).ready(function($) { }); return { - kill: function() { + kill: function () { $primaryDropdown.off('click').removeClass('is-active'); $nav.velocity('transition.slideDownIn', { duration: 0, display: 'flex', - complete: function() { + complete: function () { $nav.attr('style', ''); $body.removeClass('nav-open'); }, @@ -313,24 +313,20 @@ jQuery(document).ready(function($) { // 1.b Desktop Menu - $.fn.desktopMenu = function() { + $.fn.desktopMenu = function () { var $container = this; var $subnav = $container.find('.subfolder'); $subnav - .on('focus', 'a', function() { - $(this) - .closest('.has-subfolder') - .addClass('over'); + .on('focus', 'a', function () { + $(this).closest('.has-subfolder').addClass('over'); }) - .on('blur', 'a', function() { - $(this) - .closest('.has-subfolder') - .removeClass('over'); + .on('blur', 'a', function () { + $(this).closest('.has-subfolder').removeClass('over'); }); return { - kill: function() { + kill: function () { $subnav.off('focus').off('blur'); }, }; @@ -338,12 +334,12 @@ jQuery(document).ready(function($) { // 1.c Persistant Menu - $.fn.persistantMenu = function() { + $.fn.persistantMenu = function () { // Don't enable the scroll hidden menu for touch devices. if (is_touch_device) { console.debug('No-op persistantMenu for touch enabled devices'); return { - kill: function() { + kill: function () { console.debug('No-op persistantMenu.kill()'); }, }; @@ -387,7 +383,7 @@ jQuery(document).ready(function($) { scrollState(); return { - kill: function() { + kill: function () { $container.removeClass('minimize'); $window.off('scroll'); }, @@ -396,7 +392,7 @@ jQuery(document).ready(function($) { // 1.d Sidebar Nav - $.fn.sideNav = function(options) { + $.fn.sideNav = function (options) { var settings = $.extend( { breakpoint: 'atleast_large', @@ -427,7 +423,7 @@ jQuery(document).ready(function($) { // 1.e Mobile Side Menu - $.fn.mobileSideNav = function() { + $.fn.mobileSideNav = function () { var $body = $('body'); var $container = this; var $nav = $container.find('.sidenav-top, .sidenav-detail'); @@ -435,7 +431,7 @@ jQuery(document).ready(function($) { $nav.velocity('transition.slideUpOut', { duration: 0, display: 'none' }); - $primaryDropdown.on('click', function(e) { + $primaryDropdown.on('click', function (e) { e.preventDefault(); if ($body.hasClass('subnav-open')) { $primaryDropdown.removeClass('is-active'); @@ -455,12 +451,12 @@ jQuery(document).ready(function($) { }); return { - kill: function() { + kill: function () { $primaryDropdown.off('click').removeClass('is-active'); $nav.velocity('transition.slideDownIn', { duration: 0, display: 'block', - complete: function() { + complete: function () { $nav.attr('style', ''); $body.removeClass('subnav-open'); }, @@ -472,7 +468,7 @@ jQuery(document).ready(function($) { // 1.f Sidebar Nav Top // ------ - $.fn.sideNavTop = function() { + $.fn.sideNavTop = function () { var $label = this.find('> a, > .label'); var $active_parent = this.find( '.subfolder > .has-active-children > a, .subfolder > .is-active > a' @@ -483,8 +479,8 @@ jQuery(document).ready(function($) { $label.text(title); }; - $.fn.sideNavDetail = function() { - this.find('a[data-overviewtitle]').each(function() { + $.fn.sideNavDetail = function () { + this.find('a[data-overviewtitle]').each(function () { var $this = $(this); var attr = $this.data('overviewtitle'); $this.text(attr); @@ -494,7 +490,7 @@ jQuery(document).ready(function($) { // 1.g Sidebar Status // ------ - $.fn.sideNavStatus = function(options) { + $.fn.sideNavStatus = function (options) { var settings = $.extend( { active_el: '.sidenav-detail .is-active > a', @@ -508,7 +504,7 @@ jQuery(document).ready(function($) { // 2. Anchor scroll // ------ - $.fn.scrollto = function(options) { + $.fn.scrollto = function (options) { var settings = $.extend( { offset_lg: 0, @@ -520,11 +516,11 @@ jQuery(document).ready(function($) { var offset = settings.offset_lg; - $.subscribe('breakpoints', function(obj, media) { + $.subscribe('breakpoints', function (obj, media) { offset = media.small ? settings.offset_sm : settings.offset_lg; }); - this.on('click.scrollto', function(event) { + this.on('click.scrollto', function (event) { var $anchor = $(this); var id = $anchor.attr('href').split('#')[1]; @@ -552,7 +548,7 @@ jQuery(document).ready(function($) { // 3. Show On Inview // ------ - $.fn.showOnView = function(options) { + $.fn.showOnView = function (options) { if (is_touch_device) { console.debug('showOnView disabled for touch device'); return; @@ -582,23 +578,23 @@ jQuery(document).ready(function($) { if (settings.staggerGroup && $(settings.staggerGroup).length) { var ar = settings.staggerGroup.split(' '); var $groups = $(ar[0]); - $groups.each(function() { + $groups.each(function () { var increment = settings.staggerIncrement; var $els = $(this).find(ar[1]); - $els.each(function() { + $els.each(function () { $(this).data('onscrolldelay', increment); increment += settings.staggerIncrement; }); }); } - $window.on('scroll.onLoad', function() { + $window.on('scroll.onLoad', function () { onLoad = false; $window.off('scroll.onLoad'); }); function activate() { - $elements.each(function() { + $elements.each(function () { var $el = $(this); var delay = $el.data('onscrolldelay') !== undefined @@ -611,7 +607,7 @@ jQuery(document).ready(function($) { ? $el.data('display') : settings.display; if (settings.count == 'once') { - $el.one('inview', function(event, isInView) { + $el.one('inview', function (event, isInView) { if (isInView) { thisDelay = onLoad && onLoadDelay != undefined ? onLoadDelay : delay; @@ -624,7 +620,7 @@ jQuery(document).ready(function($) { } }); } else if (settings.count == 'everytime') { - $el.on('inview', function(event, isInView) { + $el.on('inview', function (event, isInView) { if (isInView) { thisDelay = onLoad && onLoadDelay != undefined ? onLoadDelay : delay; @@ -644,7 +640,7 @@ jQuery(document).ready(function($) { }); } - $.subscribe('breakpoints', function(obj, media) { + $.subscribe('breakpoints', function (obj, media) { active = settings.breakpoint == null || media[settings.breakpoint] || @@ -659,7 +655,7 @@ jQuery(document).ready(function($) { // 7. RSS Feed // ------ - $.fn.rss_feed = function(options) { + $.fn.rss_feed = function (options) { var settings = $.extend( { container: @@ -672,10 +668,10 @@ jQuery(document).ready(function($) { var $container = this; - $.get('https://blog.mozilla.org/addons/feed/', function(data) { + $.get('https://blog.mozilla.org/addons/feed/', function (data) { var $xml = $(data); // DOMPurify.sanitize(data) doesn't work here because data is not html var i = settings.num; - $xml.find('item').each(function() { + $xml.find('item').each(function () { if (i--) { var $this = $(this), item = { @@ -750,7 +746,7 @@ jQuery(document).ready(function($) { // 8. Anatomy of an extenstion // ------ - $.fn.extenstionAnatomy = function(options) { + $.fn.extenstionAnatomy = function (options) { var settings = $.extend( { control: $('#anatomy-control'), @@ -766,39 +762,39 @@ jQuery(document).ready(function($) { var $tile_background = $('#background'); $tile_interface - .on('mouseenter', function() { + .on('mouseenter', function () { $tile_interface.addClass('hover'); }) - .on('mouseleave', function() { + .on('mouseleave', function () { $tile_interface.removeClass('hover'); }); $tile_content - .on('mouseenter', function() { + .on('mouseenter', function () { $tile_content.addClass('hover'); }) - .on('mouseleave', function() { + .on('mouseleave', function () { $tile_content.removeClass('hover'); }); $tile_background - .on('mouseenter', function() { + .on('mouseenter', function () { $tile_background.addClass('hover'); }) - .on('mouseleave', function() { + .on('mouseleave', function () { $tile_background.removeClass('hover'); }); - $this.on('inview', function(event, isInView) { + $this.on('inview', function (event, isInView) { clearTimeout(timer1); clearTimeout(timer2); if (isInView) { var delay = first ? 700 : 100; - timer1 = setTimeout(function() { + timer1 = setTimeout(function () { $this.addClass('step-one'); settings.control.addClass('step-one'); }, delay); - timer2 = setTimeout(function() { + timer2 = setTimeout(function () { $this.addClass('step-two'); settings.control.addClass('step-two'); }, delay + 200); @@ -810,7 +806,7 @@ jQuery(document).ready(function($) { }); settings.control - .on('mouseenter', 'button', function() { + .on('mouseenter', 'button', function () { var panel = $(this).data('panel'); if (panel == 'anatomy-ui') { $tile_interface.addClass('hover'); @@ -820,7 +816,7 @@ jQuery(document).ready(function($) { $tile_background.addClass('hover'); } }) - .on('mouseleave', 'button', function() { + .on('mouseleave', 'button', function () { $tile_interface.removeClass('hover'); $tile_content.removeClass('hover'); $tile_background.removeClass('hover'); @@ -837,7 +833,7 @@ jQuery(document).ready(function($) { // 9. Popups // ------ - $.fn.popups = function(options) { + $.fn.popups = function (options) { var settings = $.extend( { panels: '.popup-panel', @@ -853,13 +849,13 @@ jQuery(document).ready(function($) { var $links = this; var $panels = $(settings.panels); - $links.on('click', function() { + $links.on('click', function () { var $link = $(this); var panel = '#' + $link.data('panel'); if ($panels.filter(':visible').length) { $panels.velocity('transition.slideDownOut', { duration: 300, - complete: function() { + complete: function () { openPanel($link, panel); }, }); @@ -874,7 +870,7 @@ jQuery(document).ready(function($) { positionPanel($panel); $panel.velocity('transition.slideUpIn', { duration: 300, - complete: function() { + complete: function () { if (!$body.hasClass('using-mouse')) { $panel.find('button.close').focus(); } @@ -883,19 +879,19 @@ jQuery(document).ready(function($) { $panel .find('button.close') .off('click') - .on('click', function() { + .on('click', function () { closePanel($link, $panel); }); $(document) .off('click.openpanel') .off('keyup.openpanel') - .on('click.openpanel', function(e) { + .on('click.openpanel', function (e) { var $target = $(e.target); if (!$target.closest(panel).length && $panel.is(':visible')) { closePanel($link, $panel); } }) - .on('keyup.openpanel', function(e) { + .on('keyup.openpanel', function (e) { if (e.key == 'Escape' && $panel.is(':visible')) { closePanel($link, $panel); } @@ -906,7 +902,7 @@ jQuery(document).ready(function($) { function closePanel($link, $panel) { $panel.velocity('transition.slideDownOut', { duration: 300, - complete: function() { + complete: function () { if (!$body.hasClass('using-mouse')) { $link.focus(); } @@ -923,7 +919,7 @@ jQuery(document).ready(function($) { } function updatePanelPosition() { - $panels.filter(':visible').each(function() { + $panels.filter(':visible').each(function () { positionPanel($(this)); }); } @@ -934,7 +930,7 @@ jQuery(document).ready(function($) { // 10. Content Guidelines Navigation // ------ - $.fn.switchContentGuidelinesNav = function(options) { + $.fn.switchContentGuidelinesNav = function (options) { var settings = $.extend( { breakpoint: 'atleast_medium', @@ -973,14 +969,14 @@ jQuery(document).ready(function($) { // 10.a Mobile Menu - $.fn.mobileContentGuidelinesMenu = function() { + $.fn.mobileContentGuidelinesMenu = function () { var $container = this; var $nav = $container.find('nav'); var $links = $container.find('p, li:not(.current)'); var open = $nav.hasClass('open'); var $window = $(window); - $window.on('scroll.mobile', function() { + $window.on('scroll.mobile', function () { if ($window.scrollTop() >= $container.offset().top) { $container.addClass('sticky'); } else { @@ -992,14 +988,14 @@ jQuery(document).ready(function($) { $links.velocity('slideUp', { duration: 0 }); } - $nav.on('click', function() { + $nav.on('click', function () { if (open) { $nav.removeClass('open'); $links.velocity('slideUp'); } else { $nav.addClass('open'); $links.velocity('slideDown', { - complete: function() { + complete: function () { // if ($nav.outerHeight() + $nav.offset().top > $window.height() + $window.scrollTop()) { // $nav.velocity('scroll', {duration: 900, offset: -($nav.outerHeight() - 16)}); // } @@ -1010,7 +1006,7 @@ jQuery(document).ready(function($) { }); return { - kill: function() { + kill: function () { $nav.off('click'); $nav.removeClass('open'); $links.attr('style', ''); @@ -1021,16 +1017,16 @@ jQuery(document).ready(function($) { // 10.b Desktop Menu - $.fn.desktopContentGuidelinesMenu = function() { + $.fn.desktopContentGuidelinesMenu = function () { return { - kill: function() {}, + kill: function () {}, }; }; // 11. Search Header // ------ - $.fn.searchHeader = function(options) { + $.fn.searchHeader = function (options) { var settings = $.extend( { open: '.search-input-open', @@ -1045,22 +1041,22 @@ jQuery(document).ready(function($) { var $close = $(settings.close); var $input = $(settings.input); - $open.on('click', function() { + $open.on('click', function () { $input.val(''); $container.velocity('transition.slideRightIn', { duration: 450, display: 'flex', - complete: function() { + complete: function () { $input.focus(); }, }); }); - $close.on('click', function() { + $close.on('click', function () { $container.velocity('transition.slideRightOut', { duration: 450 }); }); - $(document).on('keyup.searchheader', function(e) { + $(document).on('keyup.searchheader', function (e) { if (e.key == 'Escape') { $container.velocity('transition.slideRightOut', { duration: 450 }); } @@ -1070,7 +1066,7 @@ jQuery(document).ready(function($) { // 12. Search Results // ------ - $.fn.searchResults = function(options) { + $.fn.searchResults = function (options) { var settings = $.extend( { input: '.search-cta #lunrsearch', @@ -1114,7 +1110,7 @@ jQuery(document).ready(function($) { num + ' ' + $container.data('message') + ' "' + query + '"'; var $title = $('

'); - data.then(function(loaded_data) { + data.then(function (loaded_data) { // Show results $container.empty(); @@ -1167,15 +1163,15 @@ jQuery(document).ready(function($) { } // Build Lunr - data.then(function(loaded_data) { - idx = lunr(function() { + data.then(function (loaded_data) { + idx = lunr(function () { var l = this; - $.each(settings.search_fields, function(i, obj) { + $.each(settings.search_fields, function (i, obj) { l.field(obj.title, { boost: obj.boost ? obj.boost : 1 }); }); l.ref('id'); - $.each(loaded_data.entries, function(index, value) { + $.each(loaded_data.entries, function (index, value) { if (!value.skip_index) { l.add($.extend({ id: index }, value)); } @@ -1183,7 +1179,7 @@ jQuery(document).ready(function($) { }); if ($local_input) { - $local_input.on('keyup', function() { + $local_input.on('keyup', function () { var searchVal = $(this).val(); if (searchVal && searchVal.length && searchVal.length > 3) { lunr_search(searchVal); @@ -1201,7 +1197,7 @@ jQuery(document).ready(function($) { // 13. Sidebar Nav Page Section Highlighting - $.fn.highlightPageSection = function(options) { + $.fn.highlightPageSection = function (options) { var settings = $.extend( { offset: 38, @@ -1213,7 +1209,7 @@ jQuery(document).ready(function($) { var $this = this; var $anchors = this.find('a'); - $window.on('scroll', function() { + $window.on('scroll', function () { updateAnchorActive(); }); @@ -1221,7 +1217,7 @@ jQuery(document).ready(function($) { function updateAnchorActive() { $anchors.removeClass('is-in-view'); - $anchors.each(function() { + $anchors.each(function () { var $self = $(this); var $el = $($self.attr('href')); if ($el.length && isInFocus($el, 0.75)) { @@ -1237,7 +1233,7 @@ jQuery(document).ready(function($) { // 14. Expandable List // ------ - $.fn.expandableList = function(options) { + $.fn.expandableList = function (options) { var settings = $.extend( { title: 'dt', @@ -1251,7 +1247,7 @@ jQuery(document).ready(function($) { this.find(settings.title_button).attr('aria-expanded', 'false'); this.find(settings.description).attr('aria-hidden', 'true'); - this.on('click', settings.title_button, function() { + this.on('click', settings.title_button, function () { var $this = $(this); if ($this.attr('aria-expanded') == 'true') { @@ -1275,7 +1271,7 @@ jQuery(document).ready(function($) { // 16. Scroll sidebar to active page position // ------ - $.fn.sidenavScrollToActive = function(options) { + $.fn.sidenavScrollToActive = function (options) { var settings = $.extend( { active: $('.sidenav-detail .is-active'), @@ -1325,20 +1321,20 @@ jQuery(document).ready(function($) { return vars; } - var aboveView = function(element) { + var aboveView = function (element) { return ( $(window).scrollTop() >= element.offset().top + element.outerHeight() ); }; - var belowFocus = function(element, focusMultipliers) { + var belowFocus = function (element, focusMultipliers) { return ( $(window).height() + $(window).scrollTop() < element.offset().top + $(window).height() * focusMultipliers ); }; - var isInFocus = function(element, focusMultipliers) { + var isInFocus = function (element, focusMultipliers) { return ( aboveView(element) != true && belowFocus(element, focusMultipliers) != true diff --git a/_assets/js/parallax.js b/_assets/js/parallax.js index 0b40658f..32032041 100644 --- a/_assets/js/parallax.js +++ b/_assets/js/parallax.js @@ -18,8 +18,8 @@ * -------------------------------------------------------------------- */ -(function($) { - $.fn.parallax = function(settings) { +(function ($) { + $.fn.parallax = function (settings) { var config = { container: '.slideshow', offsetIntertia: 0.15, @@ -30,7 +30,7 @@ var $window = $(window); var is_touch_device = 'ontouchstart' in document.documentElement; - this.each(function() { + this.each(function () { $(this).parallaxBg({ container: config.container, offsetIntertia: config.offsetIntertia, @@ -40,14 +40,14 @@ }); }) .closest(config.container) - .on('transition_out', function(obj, $slide, $next, direction) { + .on('transition_out', function (obj, $slide, $next, direction) { $next.trigger('resizecheck'); }); return this; }; - $.fn.parallaxBg = function(settings) { + $.fn.parallaxBg = function (settings) { var config = {}; if (settings) $.extend(config, settings); @@ -118,7 +118,7 @@ }); } - $self.getBackgroundSize(function(obj) { + $self.getBackgroundSize(function (obj) { bgHeight = obj.height; bgWidth = obj.width; obj.self = null; @@ -129,7 +129,7 @@ }); if (is_slideshow) { - $self.on('resizecheck', function() { + $self.on('resizecheck', function () { resizecheck(); }); } @@ -143,21 +143,21 @@ return this; }; - var distanceFromView = function($element, $window) { + var distanceFromView = function ($element, $window) { return $window.scrollTop() - $element.offset().top; }; - var aboveView = function($element, $window) { + var aboveView = function ($element, $window) { return ( $window.scrollTop() >= $element.offset().top + $element.outerHeight() ); }; - var belowView = function($element, $window) { + var belowView = function ($element, $window) { return $window.height() + $window.scrollTop() < $element.offset().top; }; - var isInView = function($element, $window) { + var isInView = function ($element, $window) { return ( aboveView($element, $window) != true && belowView($element, $window) != true && @@ -165,14 +165,14 @@ ); }; - $.fn.getBackgroundSize = function(callback) { + $.fn.getBackgroundSize = function (callback) { var urlRegex = /url\('*(.*?)'*\)/g; var url = this.css('background-image') .replace(urlRegex, '$1') .replace(/"/g, ''); var img = new Image(); - img.onload = function() { + img.onload = function () { callback({ width: this.width, height: this.height, self: this }); }; diff --git a/_assets/js/parallaxFG.js b/_assets/js/parallaxFG.js index 1760f615..279a2991 100644 --- a/_assets/js/parallaxFG.js +++ b/_assets/js/parallaxFG.js @@ -16,8 +16,8 @@ * -------------------------------------------------------------------- */ -(function($) { - $.fn.parallaxFG = function(options) { +(function ($) { + $.fn.parallaxFG = function (options) { var settings = $.extend( { offsetIntertia: 0.15, diff --git a/_assets/js/protocol-lang-switcher-min.js b/_assets/js/protocol-lang-switcher-min.js index fb17daca..e0e013ca 100644 --- a/_assets/js/protocol-lang-switcher-min.js +++ b/_assets/js/protocol-lang-switcher-min.js @@ -1,8 +1,8 @@ if (void 0 === Mzp) var Mzp = {}; -!(function() { +!(function () { 'use strict'; var a = { - switchPath: function(t, e) { + switchPath: function (t, e) { var i = t.pathname.slice(1).split('/'), n = '/' + i[0] + '/', a; @@ -11,10 +11,10 @@ if (void 0 === Mzp) var Mzp = {}; '/' + e + '/' + i.slice(1).join('/') + t.search ); }, - doRedirect: function(t) { + doRedirect: function (t) { t && (window.location.href = t); }, - init: function(n) { + init: function (n) { for ( var t = document.querySelectorAll('.mzp-js-language-switcher-select'), e = 0; @@ -24,7 +24,7 @@ if (void 0 === Mzp) var Mzp = {}; t[e].setAttribute('data-previous-language', t[e].value), t[e].addEventListener( 'change', - function(t) { + function (t) { var e = t.target.value, i = t.target.getAttribute('data-previous-language'); 'function' == typeof n && n(i, e), diff --git a/_assets/js/protocol-lang-switcher.js b/_assets/js/protocol-lang-switcher.js index 63b7ec69..97b262bd 100644 --- a/_assets/js/protocol-lang-switcher.js +++ b/_assets/js/protocol-lang-switcher.js @@ -7,7 +7,7 @@ if (typeof Mzp === 'undefined') { var Mzp = {}; } -(function() { +(function () { 'use strict'; var LangSwitcher = {}; @@ -19,7 +19,7 @@ if (typeof Mzp === 'undefined') { * @param {String} Newly selected language code e.g. `de` * @return {String} pathname e.g. `/de/firefox/` */ - LangSwitcher.switchPath = function(location, newLang) { + LangSwitcher.switchPath = function (location, newLang) { var parts = location.pathname.slice(1).split('/'); var currentLang = '/' + parts[0] + '/'; @@ -36,7 +36,7 @@ if (typeof Mzp === 'undefined') { * Redirect page to destination URL if valid * @param {String} destination */ - LangSwitcher.doRedirect = function(destination) { + LangSwitcher.doRedirect = function (destination) { if (destination) { window.location.href = destination; } @@ -46,7 +46,7 @@ if (typeof Mzp === 'undefined') { * Initialize footer lang switcher. * @param {function} Custom callback for analytics. */ - LangSwitcher.init = function(callback) { + LangSwitcher.init = function (callback) { var language = document.querySelectorAll( '.mzp-js-language-switcher-select' ); @@ -56,7 +56,7 @@ if (typeof Mzp === 'undefined') { language[i].addEventListener( 'change', - function(e) { + function (e) { var newLanguage = e.target.value; var previousLanguage = e.target.getAttribute( 'data-previous-language' diff --git a/_assets/js/tinypubsub.js b/_assets/js/tinypubsub.js index 93788db4..c4b7df3a 100644 --- a/_assets/js/tinypubsub.js +++ b/_assets/js/tinypubsub.js @@ -1,15 +1,15 @@ /* jQuery Tiny Pub/Sub - v0.7 - 10/27/2011 * http://benalman.com/ * Copyright (c) 2011 "Cowboy" Ben Alman; Licensed MIT, GPL */ -(function(a) { +(function (a) { var b = a({}); - (a.subscribe = function() { + (a.subscribe = function () { b.on.apply(b, arguments); }), - (a.unsubscribe = function() { + (a.unsubscribe = function () { b.off.apply(b, arguments); }), - (a.publish = function() { + (a.publish = function () { b.trigger.apply(b, arguments); }); })(jQuery); diff --git a/_assets/js/youtubeplayer.js b/_assets/js/youtubeplayer.js index 21cb8e27..c29dd1d0 100644 --- a/_assets/js/youtubeplayer.js +++ b/_assets/js/youtubeplayer.js @@ -1,9 +1,9 @@ -(function($) { +(function ($) { // create deferred object // ------ var YTdeferred = $.Deferred(); - window.onYouTubeIframeAPIReady = function() { + window.onYouTubeIframeAPIReady = function () { // resolve when youtube callback is called passing YT as a parameter YTdeferred.resolve(window.YT); }; @@ -19,9 +19,9 @@ // document ready // ------ - $(document).ready(function() { + $(document).ready(function () { // whenever youtube callback was called = deferred resolved your custom function will be executed with YT as an argument - YTdeferred.done(function(YT) { + YTdeferred.done(function (YT) { $(document).video_cta({ yt_object: YT, cta: '.video-link, a[title|="Open Popup Video"], .video-popup a', @@ -29,7 +29,7 @@ }); if ($('.video-banner').length) { - $('.video-banner').each(function() { + $('.video-banner').each(function () { $(this).video_banner({ yt_object: YT }); }); } @@ -39,7 +39,7 @@ // Call to action overlay video // ------ - $.fn.video_cta = function(options) { + $.fn.video_cta = function (options) { var settings = $.extend( { yt_object: null, @@ -71,7 +71,7 @@ $('body') // Deregister to avoiding multiple bindings. .off('keyup.escCloseVideo') - .on('keyup.escCloseVideo', function(e) { + .on('keyup.escCloseVideo', function (e) { // 27 is the escape key. if (e.originalEvent.keyCode === 27 && closeVideo) { closeVideo(); @@ -82,7 +82,7 @@ $(settings.close).on('click', closeVideo); } - this.on('click', settings.cta, function(e) { + this.on('click', settings.cta, function (e) { e.preventDefault(); if ($('#' + settings.container_id).length && playing) { @@ -207,7 +207,7 @@ yt_player = null; $container.remove(); } else { - setTimeout(function() { + setTimeout(function () { yt_player = null; $container.remove(); }, 1000); @@ -218,7 +218,7 @@ // Banner background video // ------ - $.fn.video_banner = function(options) { + $.fn.video_banner = function (options) { var settings = $.extend( { yt_object: null, @@ -285,7 +285,7 @@ } } - $window.on('load resize', function() { + $window.on('load resize', function () { videoSize(); }); }; diff --git a/package.json b/package.json index c16823ed..4feb21bd 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "eslint": "6.8.0", "eslint-config-prettier": "6.10.1", "eslint-plugin-prettier": "3.1.2", - "prettier": "1.19.1", + "prettier": "2.0.5", "pretty-quick": "2.0.1", "rimraf": "3.0.2", "stylelint": "13.3.3", diff --git a/yarn.lock b/yarn.lock index e228797d..6d64e8e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2013,10 +2013,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== +prettier@2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" + integrity sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg== pretty-quick@2.0.1: version "2.0.1"