Skip to content

Commit 2c76f88

Browse files
author
fabianmoronzirfas
committed
refactor(you don't need jquery): removes jquery
having jquery in there for some minor element seelction and class toggle is an overhead BREAKING CHANGE: Removes jQuery fix #79
1 parent 7d5bc83 commit 2c76f88

15 files changed

+843
-21
lines changed

_includes/aside-left.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@
1111
-->
1212
{% assign pages = site.pages | sort: 'order' %}
1313
{% for item in pages %}{% if item.layout != 'entry' %}{%if item.layout == 'default' or item.layout == 'reference' %}{% if item.url != '/' %}
14-
<li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}" class="textgrow">{{item.title}}</a></li>
14+
<li class="menu-item {% if item.title == page.title %}active{% endif %}"><a href="{{item.url}}" class="textgrow menu-link">{{item.title}}</a></li>
1515
{% endif %}{% endif %}{% endif %}{% endfor %}
1616

1717
</ul>
18+
<div class="tweet">
19+
<div class="message"></div>
20+
<div class="tweettime"></div>
21+
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow menu-link">@basil_js</a></div>
22+
</div>
1823
</nav>
19-
<div class="tweet">
20-
<div class="message"></div>
21-
<div class="tweettime"></div>
22-
<div class="twitter-link"><a href="https://twitter.com/basil_js" class="textgrow">@basil_js</a></div>
23-
</div>
2424
<div class="fhnw-logo">
2525
<a href="http://www.fhnw.ch/hgk/ivk"><img src="/assets/images/fhnwlogo.png" alt="FHNW logo and link"></a>
2626
</div>

_layouts/default.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,18 @@
3535
<div class="guidelines"></div>
3636
{% include footer.html %}
3737
</div>
38-
<script src="/assets/js/jquery.min.js" type="text/javascript"></script>
39-
<script src="/assets/js/basiljs.js" type="text/javascript"></script>
40-
<script src="/assets/js/tweets.js" type="text/javascript" async></script>
41-
<script src="/assets/js/p5.min.js" type="text/javascript" defer></script>
42-
<script src="/assets/js/sketch.js" type="text/javascript" defer></script>
43-
<script src="/assets/js/main.bundle.js" type="text/javascript" defer></script>
44-
<script type="text/javascript">
38+
{% if jekyll.environment == "production" %}
39+
<script src="assets/js/vendors~main.bundle.js" type="text/javascript" defer></script>
40+
{% endif %}
41+
<script src="/assets/js/main.bundle.js" type="text/javascript"></script>
42+
<!-- <script type="text/javascript">
4543
window.onblur = function() {
4644
noLoop();
4745
}
4846
window.onfocus = function() {
4947
loop();
5048
}
51-
</script>
49+
</script> -->
5250
{% if page.layout == 'reference' %}
5351
<script src="/assets/js/reference.bundle.js" type="text/javascript"></script>
5452
{% endif %}

assets/js/main.bundle.js

Lines changed: 458 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/main.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/reference.bundle.js

Lines changed: 102 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/reference.bundle.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/js/src/decoration-nojq.js

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/* global $*/
2+
export function specialChars() {
3+
let elements = document.querySelectorAll('a.textgrow');
4+
[...elements].forEach( element => {
5+
const chars = element.innerText.split('');
6+
element.innerHTML = null;
7+
chars.forEach((char, i) => {
8+
const fontSize = 30 - (2 * i);
9+
const style = `border-bottom-width: ${ (i+1) }px; font-size: ${fontSize }px; top: -${(i+(2*i))}px;`;
10+
const node = document.createElement('span');
11+
node.style.cssText = style;
12+
const content = document.createTextNode(char);
13+
node.appendChild(content);
14+
element.appendChild(node);
15+
});
16+
});
17+
}
18+
19+
export function createGuideLines() {
20+
const element = document.querySelector('.guidelines');
21+
const bottomlines = document.createElement('div');
22+
const rightlines = document.createElement('div');
23+
const pagelines = document.createElement('div');
24+
bottomlines.className = 'bottom_lines';
25+
rightlines.className = 'right_lines';
26+
pagelines.className = 'page_lines';
27+
28+
for (let i = 0; i < 5; i++) {
29+
const line = document.createElement('div');
30+
line.classList.add('bottomLine', `line_${i+1}`);
31+
bottomlines.appendChild(line);
32+
}
33+
for (let i = 0; i < 3; i++) {
34+
const line = document.createElement('div');
35+
line.classList.add('right_line', `line_${i+1}`);
36+
rightlines.appendChild(line);
37+
}
38+
for (let i = 0; i < 4; i++) {
39+
const line = document.createElement('div');
40+
line.classList.add('line', `line_${i+1}`);
41+
pagelines.appendChild(line);
42+
}
43+
element.appendChild(bottomlines);
44+
element.appendChild(rightlines);
45+
element.appendChild(pagelines);
46+
}

assets/js/src/decoration.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/* global $*/
2+
export function specialChars() {
3+
$('a.textgrow').each(function() {
4+
const chars = $(this).text().split('');
5+
const that = $(this);
6+
that.empty();
7+
$.each(chars, function(i, char) {
8+
const fontSize = 30 - (2 * i);
9+
const style = `border-bottom-width: ${ (i+1) }px; font-size: ${fontSize }px; top: -${(i+(2*i))}px;`;
10+
that.append('<span style="' + style + '">' + char + '</span>');
11+
});
12+
});
13+
}
14+
15+
export function createGuideLines() {
16+
$('.guidelines').append('<div class="bottom_lines">');
17+
for (var b = 0; b < 5; b++) {
18+
$('.bottom_lines').append('<div class="bottomLine line_' + (b + 1) + '">');
19+
}
20+
$('.guidelines').append('<div class="right_lines">');
21+
for (var r = 0; r < 3; r++) {
22+
$('.right_lines').append('<div class="right_line line_' + (r + 1) + '">');
23+
}
24+
$('.guidelines').append('<div class="page_lines">');
25+
for (var i = 0; i < 4; i++) {
26+
$('.page_lines').append('<div class="line line_' + (i + 1) + '">');
27+
}
28+
}

assets/js/src/main.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
1-
/* global $ */
2-
$(document).ready(()=>{
3-
console.log('JQ: doc ready...');
1+
// import $ from 'jquery';
2+
import p5 from 'p5/lib/p5.min';
3+
import sketch from './p5sketch.js';
4+
import mobileNav from './mobile-nav-nojq.js';
5+
import tweets from './tweets.js';
6+
// import { createGuideLines} from './decoration.js';
7+
import {specialChars, createGuideLines} from './decoration-nojq.js';
8+
let p5sketch;
9+
document.addEventListener('DOMContentLoaded',() =>{
10+
specialChars();
11+
createGuideLines();
12+
mobileNav();
13+
tweets();
14+
p5sketch = new p5(sketch);
415
});
16+
17+
18+
window.onblur = function() {
19+
p5sketch.noLoop();
20+
};
21+
window.onfocus = function() {
22+
p5sketch.loop();
23+
};

0 commit comments

Comments
 (0)