Skip to content

Commit

Permalink
👔 fix manual lints
Browse files Browse the repository at this point in the history
  • Loading branch information
desandro committed Mar 27, 2022
1 parent 53bb403 commit 152ee93
Show file tree
Hide file tree
Showing 35 changed files with 38 additions and 57 deletions.
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ let site = {
productName: 'Flickity',
description: 'Touch, responsive, flickable carousels',
majorVersion: 2,
isDev: process.argv[2] == 'dev',
isExport: process.argv[2] == 'export',
isDev: process.argv[2] === 'dev',
isExport: process.argv[2] === 'export',
},
};

Expand Down
7 changes: 2 additions & 5 deletions js/boilerplate.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
// boilerplate
( function() {
'use strict';

// global namespace
let FlickityDocs = window.FlickityDocs = {};

// ----- utils ----- //

window.utils = fizzyUIUtils;
window.utils = window.fizzyUIUtils;

// ----- helpers ----- //

Expand All @@ -24,9 +23,7 @@ FlickityDocs.makeCellElem = function( num ) {

window.filterBind = function( elem, type, selector, listener ) {
elem.addEventListener( type, function( event ) {
if ( matchesSelector( event.target, selector ) ) {
listener( event );
}
if ( event.target.matches( selector ) ) listener( event );
} );
};

Expand Down
6 changes: 3 additions & 3 deletions js/init.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
( function() {
'use strict';
/* globals FlickityDocs, FizzyDocs */

// init all modules, based on their data-js attribute
( function() {

// init all modules, based on their data-js attribute
let jsModuleElems = document.querySelectorAll('[data-js]');
for ( let i = 0; i < jsModuleElems.length; i++ ) {
let elem = jsModuleElems[i];
Expand Down
6 changes: 6 additions & 0 deletions modules/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@ module.exports = {
ecmaVersion: 2018,
},
globals: {
Draggabilly: false,
filterBind: false,
Flickity: false,
FlickityDocs: false,
getSize: false,
utils: false,
},
rules: {
'prefer-object-spread': 'error',
Expand Down
1 change: 0 additions & 1 deletion modules/demos/append/append.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.append = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
2 changes: 1 addition & 1 deletion modules/demos/arrow-wiz/arrow-wiz.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['arrow-wiz'] = function( elem ) {
'use strict';

let wiz = elem;

Expand All @@ -8,6 +7,7 @@ FlickityDocs['arrow-wiz'] = function( elem ) {
let canvasWidth = canvas.width;
let canvasHeight = canvas.height;

/* eslint-disable-next-line max-params */
function line( ax, ay, bx, by, color ) {
if ( color ) {
ctx.strokeStyle = color;
Expand Down
1 change: 0 additions & 1 deletion modules/demos/custom-nav/custom-nav.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['custom-nav'] = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/demos/destroy/destroy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.destroy = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
3 changes: 1 addition & 2 deletions modules/demos/events-table/events-table.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['events-table'] = function( elem ) {
'use strict';

let table = elem.querySelector('.event-table');
let tbody = table.querySelector('tbody');
Expand Down Expand Up @@ -31,7 +30,7 @@ FlickityDocs['events-table'] = function( elem ) {
row.appendChild( eventCell );
row.appendChild( messageCell );
let rows = tbody.children;
if ( rows.length == 1 ) {
if ( rows.length === 1 ) {
tbody.appendChild( row );
} else {
tbody.insertBefore( row, rows[1] );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/fullscreen/view-fullscreen-demo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['view-fullscreen-demo'] = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/demos/insert/insert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.insert = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/demos/keyhole/keyhole.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.keyhole = function( elem ) {
'use strict';

let transformProp = typeof elem.style.transform == 'string' ?
'transform' : 'WebkitTransform';
Expand Down
1 change: 0 additions & 1 deletion modules/demos/next/next.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.next = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
4 changes: 2 additions & 2 deletions modules/demos/parallax/parallax.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.parallax = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand All @@ -19,6 +18,7 @@ FlickityDocs.parallax = function( elem ) {
flkty.reposition();

function moveParallaxLayer( layer, layerRatio, progress ) {
layer.style.left = ( 0.5 - ( 0.5 + progress * 4 ) * cellRatio * layerRatio ) * 100 + '%';
let decimal = 0.5 - ( 0.5 + progress * 4 ) * cellRatio * layerRatio;
layer.style.left = decimal * 100 + '%';
}
};
1 change: 0 additions & 1 deletion modules/demos/player/player.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.player = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/demos/prepend/prepend.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.prepend = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/previous/previous.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.previous = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/progress-bar/progress-bar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['progress-bar'] = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let progressBar = elem.querySelector('.progress-bar__bar');
Expand Down
1 change: 0 additions & 1 deletion modules/demos/remove/remove.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.remove = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/demos/reposition/reposition.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.reposition = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/resize-show/resize-show.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['resize-show'] = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/resize/resize.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.resize = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel );
Expand Down
1 change: 0 additions & 1 deletion modules/demos/select-cell-selector/select-cell-selector.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['select-cell-selector'] = function( elem ) {
'use strict';

let flkty = new Flickity( elem.querySelector('.carousel'), {
groupCells: true,
Expand Down
1 change: 0 additions & 1 deletion modules/demos/select-cell/select-cell.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['select-cell'] = function( elem ) {
'use strict';

let utils = window.fizzyUIUtils;

Expand Down
1 change: 0 additions & 1 deletion modules/demos/select-instant/select-instant.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['select-instant'] = function( elem ) {
'use strict';

let utils = window.fizzyUIUtils;

Expand Down
1 change: 0 additions & 1 deletion modules/demos/select/select.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs.select = function( elem ) {
'use strict';

let utils = window.fizzyUIUtils;

Expand Down
1 change: 0 additions & 1 deletion modules/demos/static-click/static-click.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['static-click'] = function( elem ) {
'use strict';

let carousel = elem.querySelector('.carousel');
let flkty = new Flickity( carousel, {
Expand Down
1 change: 0 additions & 1 deletion modules/hero-carousel/hero-carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FlickityDocs['hero-carousel'] = function( elem ) {
'use strict';

let firstCell = elem.querySelector('.hero-carousel__cell--1');
let illoImg = firstCell.querySelector('.hero-illustration');
Expand Down
1 change: 0 additions & 1 deletion modules/page-nav/page-nav.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* globals Stickeroo */
FlickityDocs['page-nav'] = function( elem ) {
'use strict';

new Stickeroo( elem );
};
7 changes: 2 additions & 5 deletions modules/page-nav/stickeroo.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
( function( window ) {
'use strict';

// -------------------------- Stickeroo -------------------------- //

Expand All @@ -21,7 +20,7 @@ Stickeroo.prototype.onresize = function() {
let afterContent = getComputedStyle( this.element, ':after' ).content;
let size = getSize( this.element );
// activate if :after { content: 'sticky' } and fits in window
if ( afterContent.indexOf('sticky') != -1 && size.innerHeight <= window.innerHeight ) {
if ( afterContent.indexOf('sticky') !== -1 && size.innerHeight <= window.innerHeight ) {
this.activate();
} else {
this.deactivate();
Expand Down Expand Up @@ -73,9 +72,7 @@ function throttleProto( _class, methodName, threshold ) {

Stickeroo.prototype.onscroll = function() {
let isFixed = window.pageYOffset >= this.originalY;
if ( isFixed == this.isFixed ) {
return;
}
if ( isFixed === this.isFixed ) return;

this.element.classList.toggle('is-fixed');
this.isFixed = isFixed;
Expand Down
2 changes: 1 addition & 1 deletion tasks/css.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ gulp.task( 'css', function() {
} );

module.exports = function( site ) {
site.data.css_paths = getGlobPaths( cssSrc );
site.data.cssPaths = getGlobPaths( cssSrc );
};
2 changes: 1 addition & 1 deletion tasks/js.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ gulp.task( 'js', function() {
} );

module.exports = function( site ) {
site.data.js_paths = getGlobPaths( jsSrc );
site.data.jsPaths = getGlobPaths( jsSrc );
};
14 changes: 8 additions & 6 deletions tasks/utils/highlight-code-block.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ highlightjs.configure({
});

let hljsJavascript = highlightjs.getLanguage('javascript');
// highlight Packery
// highlight Flickity & flkty
/* eslint-disable camelcase */
hljsJavascript.keywords.flickity_keyword = 'Flickity';
// highlight packery variables
hljsJavascript.keywords.flickity_var = 'flkty';
/* eslint-enable camelcase */

hljsJavascript.contains.push({
className: 'jquery_var',
Expand All @@ -32,11 +33,12 @@ function replaceCodeBlock( match, leadingWhiteSpace, block ) {
block = block.replace( reLeadingWhiteSpace, '' );
}
// highlight code
let highlighted = language ? highlightjs.highlight( language, block, true ).value : block;
let highlighted = language ? highlightjs.highlight( language, block, true ).value :
block;
// wrap in <pre><code>
let html = '\n<pre><code' +
( language ? ' class="' + language + '"' : '' ) + '>' +
highlighted + '</code></pre>';
let html = `<pre>
<code class=${language || ''}>${highlighted}</code>
</pre>`;
return html;
}

Expand Down
12 changes: 7 additions & 5 deletions tasks/utils/page-nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ let transfob = require('transfob');

module.exports = function pageNav() {
return transfob( function( file, enc, next ) {
/* eslint-disable-next-line id-length */
let $ = cheerio.load( file.contents.toString(), {
recognizeSelfClosing: true, // for inline SVG
} );
Expand All @@ -14,15 +15,16 @@ module.exports = function pageNav() {
let title = $header.text();
let slug = title.replace( /[^\w\d]+/gi, '-' )
// trim trailing hyphens
.replace( /^\-+/, '' )
.replace( /\-+$/, '' )
.replace( /^-+/, '' )
.replace( /-+$/, '' )
.toLowerCase();
// set id slug
$header.attr( 'id', slug );
// add item to pageNav
pageNavHtml += '<li class="page-nav__item page-nav__item--' +
header.name + '">' + '<a href="#' + slug + '">' + title +
'</a></li>\n';

pageNavHtml += `<li class="page-nav__item page-nav__item--${header.name}">
<a href="#${slug}">${title}</a>
</li>`;
} );
// add pageNavHtml to page
$('.page-nav').html( pageNavHtml );
Expand Down
4 changes: 2 additions & 2 deletions templates/page.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<title>{{productName}} v2 &middot; {{#if page.is_homepage}}{{description}}{{else}}{{page.title}}{{/if}}</title>

{{#if isDev}}
{{#each css_paths}}
{{#each cssPaths}}
<link rel="stylesheet" href="../{{this}}" />
{{/each}}
{{else}}
Expand Down Expand Up @@ -55,7 +55,7 @@
{{> site-footer flickity=true}}

{{#if isDev}}
{{#each js_paths}}
{{#each jsPaths}}
<script src="../{{this}}"></script>
{{/each}}
{{else}}
Expand Down

0 comments on commit 152ee93

Please sign in to comment.