From fbbee41398865a09ef815fd0bb329e9ce86acd89 Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Wed, 10 Oct 2018 12:17:56 +0200
Subject: [PATCH] Lint fixes for javascript.
---
.../src/javascript/apply/activity-feed.js | 11 +++++--
.../src/javascript/apply/all-reviews-table.js | 31 +++++++++++++------
.../apply/determination-template.js | 12 ++++---
.../src/javascript/apply/fancybox-global.js | 10 +++---
.../src/javascript/apply/list-input-files.js | 2 +-
.../javascript/apply/submission-filters.js | 9 ++++--
.../javascript/apply/submission-tooltips.js | 2 +-
.../static_src/src/javascript/apply/tabs.js | 8 ++---
.../javascript/apply/toggle-actions-panel.js | 4 +--
.../src/javascript/apply/toggle-reviewers.js | 13 +++++---
opentech/static_src/src/javascript/main.js | 9 +++---
11 files changed, 70 insertions(+), 41 deletions(-)
diff --git a/opentech/static_src/src/javascript/apply/activity-feed.js b/opentech/static_src/src/javascript/apply/activity-feed.js
index 9b6a07193..c7daabbb2 100644
--- a/opentech/static_src/src/javascript/apply/activity-feed.js
+++ b/opentech/static_src/src/javascript/apply/activity-feed.js
@@ -17,11 +17,16 @@
});
// Show scroll to top of activity feed button on scroll
- $('.js-activity-feed').on('scroll', function() {
- $(this).scrollTop() === 0 ? $('.js-to-top').removeClass('is-visible') : $('.js-to-top').addClass('is-visible');
+ $('.js-activity-feed').on('scroll', function () {
+ if ($(this).scrollTop() === 0) {
+ $('.js-to-top').removeClass('is-visible');
+ }
+ else {
+ $('.js-to-top').addClass('is-visible');
+ }
});
// Scroll to the top of the activity feed
- $('.js-to-top').click(() => $('.js-activity-feed').animate({ scrollTop: 0 }, 250));
+ $('.js-to-top').click(() => $('.js-activity-feed').animate({scrollTop: 0}, 250));
})(jQuery);
diff --git a/opentech/static_src/src/javascript/apply/all-reviews-table.js b/opentech/static_src/src/javascript/apply/all-reviews-table.js
index 733bd77e1..7ae59760c 100644
--- a/opentech/static_src/src/javascript/apply/all-reviews-table.js
+++ b/opentech/static_src/src/javascript/apply/all-reviews-table.js
@@ -6,20 +6,31 @@
$('.js-reviews-table').attachDragger();
// Enable click and drag scrolling within a div
- $.fn.attachDragger = function(){
- let attachment = false, lastPosition, position, difference;
- $($(this).selector ).on('mousedown mouseup mousemove', (e) => {
- if(e.type == 'mousedown') attachment = true, lastPosition = [e.clientX, e.clientY];
- if(e.type == 'mouseup') attachment = false;
- if(e.type == 'mousemove' && attachment == true ){
+ $.fn.attachDragger = function () {
+ let attachment = false;
+ let lastPosition;
+ let position;
+ let difference;
+
+ $($(this).selector).on('mousedown mouseup mousemove', (e) => {
+ if (e.type === 'mousedown') {
+ attachment = true;
+ lastPosition = [e.clientX, e.clientY];
+ }
+ if (e.type === 'mouseup') {
+ attachment = false;
+ }
+ if (e.type === 'mousemove' && attachment === true) {
position = [e.clientX, e.clientY];
- difference = [ (position[0]-lastPosition[0]), (position[1]-lastPosition[1])];
- $(this).scrollLeft( $(this).scrollLeft() - difference[0]);
- $(this).scrollTop( $(this).scrollTop() - difference[1]);
+ difference = [(position[0] - lastPosition[0]), (position[1] - lastPosition[1])];
+ $(this).scrollLeft($(this).scrollLeft() - difference[0]);
+ $(this).scrollTop($(this).scrollTop() - difference[1]);
lastPosition = [e.clientX, e.clientY];
}
});
- $(window).on('mouseup', () => attachment = false);
+ (window).on('mouseup', function () {
+ attachment = false;
+ });
};
})(jQuery);
diff --git a/opentech/static_src/src/javascript/apply/determination-template.js b/opentech/static_src/src/javascript/apply/determination-template.js
index 85d760240..092e2ce55 100644
--- a/opentech/static_src/src/javascript/apply/determination-template.js
+++ b/opentech/static_src/src/javascript/apply/determination-template.js
@@ -3,7 +3,7 @@
'use strict';
let DeterminationCopy = class {
- static selector(){
+ static selector() {
return '#id_outcome';
}
@@ -12,18 +12,20 @@
this.bindEventListeners();
}
- bindEventListeners(){
+ bindEventListeners() {
this.node.addEventListener('change', (e) => {
this.getMatchingCopy(e.target.value);
}, false);
}
getMatchingCopy(value) {
- if (value === '0'){
+ if (value === '0') {
this.text = document.querySelector('div[data-type="rejected"]').textContent;
- } else if (value === '1') {
+ }
+ else if (value === '1') {
this.text = document.querySelector('div[data-type="more_info"]').textContent;
- } else {
+ }
+ else {
this.text = document.querySelector('div[data-type="accepted"]').textContent;
}
this.updateTextArea(this.text);
diff --git a/opentech/static_src/src/javascript/apply/fancybox-global.js b/opentech/static_src/src/javascript/apply/fancybox-global.js
index 8b5c9b90c..616c78f49 100644
--- a/opentech/static_src/src/javascript/apply/fancybox-global.js
+++ b/opentech/static_src/src/javascript/apply/fancybox-global.js
@@ -3,16 +3,18 @@
'use strict';
$('[data-fancybox]').fancybox({
- animationDuration : 350,
- animationEffect : 'fade',
- afterClose: function(){
+ animationDuration: 350,
+ animationEffect: 'fade',
+ afterClose: function () {
$('.django-select2-checkboxes').select2('close');
}
});
// Close any open select2 dropdowns when inside a modal
$('.modal').click((e) => {
- if (e.target.classList.contains('select2-selection__rendered')) return;
+ if (e.target.classList.contains('select2-selection__rendered')) {
+ return;
+ }
$('.django-select2-checkboxes').select2('close');
});
diff --git a/opentech/static_src/src/javascript/apply/list-input-files.js b/opentech/static_src/src/javascript/apply/list-input-files.js
index 4b6407668..4ac805e77 100644
--- a/opentech/static_src/src/javascript/apply/list-input-files.js
+++ b/opentech/static_src/src/javascript/apply/list-input-files.js
@@ -3,7 +3,7 @@
'use strict';
function listInputFiles() {
- $('input[type=file]').change(function() {
+ $('input[type=file]').change(function () {
// remove any existing files first
$(this).siblings('.form__file').remove();
for (let i = 0; i < $(this)[0].files.length; ++i) {
diff --git a/opentech/static_src/src/javascript/apply/submission-filters.js b/opentech/static_src/src/javascript/apply/submission-filters.js
index 9a310a56a..fe4f36b9c 100644
--- a/opentech/static_src/src/javascript/apply/submission-filters.js
+++ b/opentech/static_src/src/javascript/apply/submission-filters.js
@@ -18,9 +18,10 @@
let match = $(`.select2-selection[aria-owns="${selectId}"]`);
// if the dropdown contains a clear class, the filters are active
- if($(match[0]).find('span.select2-selection__clear').length !== 0) {
+ if ($(match[0]).find('span.select2-selection__clear').length !== 0) {
match[0].classList.add('is-active');
- } else {
+ }
+ else {
match[0].classList.remove('is-active');
}
});
@@ -28,7 +29,9 @@
// remove active class on clearing select2
$('.select2').on('select2:unselecting', (e) => {
const dropdown = e.target.nextElementSibling.firstChild.firstChild;
- (dropdown.classList.contains('is-active')) ? dropdown.classList.remove('is-active') : null;
+ if (dropdown.classList.contains('is-active')) {
+ dropdown.classList.remove('is-active');
+ }
});
// open mobile filters
diff --git a/opentech/static_src/src/javascript/apply/submission-tooltips.js b/opentech/static_src/src/javascript/apply/submission-tooltips.js
index 13d453e28..2aa9fd46d 100644
--- a/opentech/static_src/src/javascript/apply/submission-tooltips.js
+++ b/opentech/static_src/src/javascript/apply/submission-tooltips.js
@@ -8,7 +8,7 @@
const titles = Array.prototype.slice.call(document.querySelectorAll('.js-title'));
// if the tile has been truncated...
- titles.forEach(function(title) {
+ titles.forEach(function (title) {
if (title.textContent.indexOf('...') >= 0) {
addToolTip(title);
}
diff --git a/opentech/static_src/src/javascript/apply/tabs.js b/opentech/static_src/src/javascript/apply/tabs.js
index 20b462e43..d7ade5775 100644
--- a/opentech/static_src/src/javascript/apply/tabs.js
+++ b/opentech/static_src/src/javascript/apply/tabs.js
@@ -53,14 +53,14 @@
this.updateUrl(tab);
}
- stripTabClasses(){
+ stripTabClasses() {
// remove active classes from all tabs and tab contents
this.tabItems.forEach(tabItem => tabItem.classList.remove(this.tabActiveClass));
this.tabsContents.forEach(tabsContent => tabsContent.classList.remove(this.tabContentActiveClass));
}
- addTabClasses(tab){
- if(tab === null) {
+ addTabClasses(tab) {
+ if (tab === null) {
tab = document.querySelector(`[data-tab=${this.defaultSelectedTab}]`);
}
@@ -71,7 +71,7 @@
document.querySelector(`#${tabId}`).classList.add(this.tabContentActiveClass);
}
- updateUrl(tab){
+ updateUrl(tab) {
window.location.hash = tab.getAttribute('href');
}
};
diff --git a/opentech/static_src/src/javascript/apply/toggle-actions-panel.js b/opentech/static_src/src/javascript/apply/toggle-actions-panel.js
index 64dc0eadd..6050e3315 100644
--- a/opentech/static_src/src/javascript/apply/toggle-actions-panel.js
+++ b/opentech/static_src/src/javascript/apply/toggle-actions-panel.js
@@ -2,8 +2,8 @@
'use strict';
- function toggleActionsPanel(){
- $('.js-actions-toggle').click(function(e) {
+ function toggleActionsPanel() {
+ $('.js-actions-toggle').click(function (e) {
e.preventDefault();
this.classList.toggle('is-active');
this.nextElementSibling.classList.toggle('is-visible');
diff --git a/opentech/static_src/src/javascript/apply/toggle-reviewers.js b/opentech/static_src/src/javascript/apply/toggle-reviewers.js
index cfbb5c990..ed8715e3d 100644
--- a/opentech/static_src/src/javascript/apply/toggle-reviewers.js
+++ b/opentech/static_src/src/javascript/apply/toggle-reviewers.js
@@ -5,12 +5,17 @@
// get all the reviewers that are missing
const reviewers = Array.prototype.slice.call($('.js-reviews-sidebar').find('tr.hidden.no-response'));
- $('.js-toggle-reviewers').click(function(e) {
+ $('.js-toggle-reviewers').click(function (e) {
e.preventDefault();
// toggle class and update text
$(this).toggleClass('is-open');
- $(this).hasClass('is-open') ? $(this).html('Hide All Assigned Advisors') : $(this).html('All Assigned Advisors');
+ if ($(this).hasClass('is-open')) {
+ $(this).html('Hide All Assigned Advisors');
+ }
+ else {
+ $(this).html('All Assigned Advisors');
+ }
// toggle the reviewers
toggleReviewers(reviewers);
@@ -18,9 +23,9 @@
// show/hide the reviewers
function toggleReviewers(reviewers) {
- reviewers.forEach(((reviewer) => {
+ reviewers.forEach(reviewer => {
$(reviewer).toggleClass('hidden');
- }));
+ });
}
})(jQuery);
diff --git a/opentech/static_src/src/javascript/main.js b/opentech/static_src/src/javascript/main.js
index ea8e83040..34772e074 100755
--- a/opentech/static_src/src/javascript/main.js
+++ b/opentech/static_src/src/javascript/main.js
@@ -57,14 +57,14 @@
// check if search exists
if (document.body.contains(this.search[0])) {
// reset the search whenever the mobile menu is toggled
- if(this.search[0].classList.contains('is-visible')){
+ if (this.search[0].classList.contains('is-visible')) {
this.search[0].classList.toggle('is-visible');
document.querySelector('.header__inner--menu-open').classList.toggle('header__inner--search-open');
}
}
// reset the search show/hide icons
- if(this.mobileMenu[0].classList.contains('is-visible') && document.body.contains(this.search[0])){
+ if (this.mobileMenu[0].classList.contains('is-visible') && document.body.contains(this.search[0])) {
document.querySelector('.header__icon--open-search-menu-closed').classList.remove('is-hidden');
document.querySelector('.header__icon--close-search-menu-closed').classList.remove('is-unhidden');
}
@@ -141,7 +141,8 @@
$('.select2').on('click', (e) => {
mobileFilterPadding(e.target);
});
- } else {
+ }
+ else {
$('body').removeClass('no-scroll');
$('.js-filter-wrapper').removeClass('is-open');
$('.js-filter-list').removeClass('form__filters--mobile');
@@ -161,7 +162,7 @@
// reset the margin of the select we previously worked
openDropdown.removeClass(expanded);
// store the offset to adjust the new select box (elements above the old dropdown unaffected)
- if (dropdown.position().top > openDropdown.position().top ){
+ if (dropdown.position().top > openDropdown.position().top) {
dropdownMargin = parseInt(openDropdown.css('marginBottom'));
}
openDropdown.css('margin-bottom', '0px');
--
GitLab