Skip to content

Commit 7c4d842

Browse files
cotes2020cotes2020
committed
Improve JS code style.
1 parent b6eee54 commit 7c4d842

11 files changed

Lines changed: 256 additions & 250 deletions

‎assets/js/_commons/back-to-top.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ Reference: https://bootsnipp.com/snippets/featured/link-to-top-page
33
*/
44
$(window).scroll(function() {
55
if ($(this).scrollTop() > 50
6-
&& $('#sidebar-trigger').css('display') == 'none') {
7-
$('#back-to-top').fadeIn();
6+
&& $("#sidebar-trigger").css("display") === "none") {
7+
$("#back-to-top").fadeIn();
88
} else {
9-
$('#back-to-top').fadeOut();
9+
$("#back-to-top").fadeOut();
1010
}
1111
});
1212

1313
$(function() {
14-
$('#back-to-top').click(function() {
15-
$('body,html').animate({scrollTop: 0}, 800);
14+
$("#back-to-top").click(function() {
15+
$("body,html").animate({scrollTop: 0}, 800);
1616
return false;
1717
});
1818
});

‎assets/js/_commons/copy-link.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
/*
2-
* Copy current page url to clipboard.
3-
* v2.1
4-
* https://github.com/cotes2020/jekyll-theme-chirpy
5-
* © 2020 Cotes Chung
6-
* MIT License
7-
*/
2+
* Copy current page url to clipboard.
3+
* v2.1
4+
* https://github.com/cotes2020/jekyll-theme-chirpy
5+
* © 2020 Cotes Chung
6+
* MIT License
7+
*/
88

99
function copyLink(url) {
10-
if (!url || 0 === url.length)
10+
if (!url || 0 === url.length) {
11+
return;
12+
}
13+
1114
url = window.location.href;
1215
var $temp = $("<input>");
1316

@@ -17,4 +20,5 @@ function copyLink(url) {
1720
$temp.remove();
1821

1922
alert("Link copied successfully!");
23+
2024
}

‎assets/js/_commons/search-display.js‎

Lines changed: 60 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -8,94 +8,95 @@
88

99
$(function() {
1010

11-
var btnSbTrigger = $('#sidebar-trigger');
12-
var btnSearchTrigger = $('#search-trigger');
13-
var btnCancel = $('#search-cancel');
14-
var btnClear = $('#search-cleaner');
11+
var btnSbTrigger = $("#sidebar-trigger");
12+
var btnSearchTrigger = $("#search-trigger");
13+
var btnCancel = $("#search-cancel");
14+
var btnClear = $("#search-cleaner");
1515

16-
var main = $('#main');
17-
var topbarTitle = $('#topbar-title');
18-
var searchWrapper = $('#search-wrapper');
19-
var resultWrapper = $('#search-result-wrapper');
20-
var results = $('#search-results');
21-
var input = $('#search-input');
22-
var hints = $('#search-hints');
16+
var main = $("#main");
17+
var topbarTitle = $("#topbar-title");
18+
var searchWrapper = $("#search-wrapper");
19+
var resultWrapper = $("#search-result-wrapper");
20+
var results = $("#search-results");
21+
var input = $("#search-input");
22+
var hints = $("#search-hints");
2323

2424

2525
/*--- Actions in small screens (Sidebar unloaded) ---*/
2626

2727
var scrollBlocker = (function() {
2828
var offset = 0;
2929
return {
30-
block: function() {
30+
block() {
3131
offset = $(window).scrollTop();
3232
},
33-
release: function() {
34-
$('html,body').scrollTop(offset);
33+
release() {
34+
$("html,body").scrollTop(offset);
3535
},
36-
getOffset: function() {
36+
getOffset() {
3737
return offset;
3838
}
39-
}
40-
})();
39+
};
40+
}());
4141

4242
var mobileSearchBar = (function() {
4343
return {
44-
on: function() {
45-
btnSbTrigger.addClass('unloaded');
46-
topbarTitle.addClass('unloaded');
47-
btnSearchTrigger.addClass('unloaded');
48-
searchWrapper.addClass('d-flex');
49-
btnCancel.addClass('loaded');
44+
on() {
45+
btnSbTrigger.addClass("unloaded");
46+
topbarTitle.addClass("unloaded");
47+
btnSearchTrigger.addClass("unloaded");
48+
searchWrapper.addClass("d-flex");
49+
btnCancel.addClass("loaded");
5050
},
51-
off: function() {
52-
btnCancel.removeClass('loaded');
53-
searchWrapper.removeClass('d-flex');
54-
btnSbTrigger.removeClass('unloaded');
55-
topbarTitle.removeClass('unloaded');
56-
btnSearchTrigger.removeClass('unloaded');
51+
off() {
52+
btnCancel.removeClass("loaded");
53+
searchWrapper.removeClass("d-flex");
54+
btnSbTrigger.removeClass("unloaded");
55+
topbarTitle.removeClass("unloaded");
56+
btnSearchTrigger.removeClass("unloaded");
5757
}
58-
}
59-
})();
58+
};
59+
}());
6060

6161
var resultSwitch = (function() {
6262
var visable = false;
6363

6464
return {
65-
on: function() {
65+
on() {
6666
if (!visable) {
67-
resultWrapper.removeClass('unloaded');
68-
main.addClass('hidden');
67+
resultWrapper.removeClass("unloaded");
68+
main.addClass("hidden");
6969

7070
visable = true;
7171
scrollBlocker.block();
7272
}
7373
},
74-
off: function() {
74+
off() {
7575
if (visable) {
7676
results.empty();
77-
if (hints.hasClass('unloaded')) {
78-
hints.removeClass('unloaded');
77+
if (hints.hasClass("unloaded")) {
78+
hints.removeClass("unloaded");
7979
}
80-
resultWrapper.addClass('unloaded');
81-
btnClear.removeClass('visable');
82-
main.removeClass('hidden');
80+
resultWrapper.addClass("unloaded");
81+
btnClear.removeClass("visable");
82+
main.removeClass("hidden");
8383

84-
input.val('');
84+
input.val("");
8585
visable = false;
8686

8787
scrollBlocker.release();
8888
}
8989
},
90-
isVisable: function() {
90+
isVisable() {
9191
return visable;
9292
}
93-
}
94-
})();
93+
};
94+
95+
}());
9596

9697

9798
function isMobileView() {
98-
return btnCancel.hasClass('loaded');
99+
return btnCancel.hasClass("loaded");
99100
}
100101

101102
btnSearchTrigger.click(function() {
@@ -110,45 +111,45 @@ $(function() {
110111
});
111112

112113
input.focus(function() {
113-
searchWrapper.addClass('input-focus');
114+
searchWrapper.addClass("input-focus");
114115
});
115116

116117
input.focusout(function() {
117-
searchWrapper.removeClass('input-focus');
118+
searchWrapper.removeClass("input-focus");
118119
});
119120

120-
input.on('keyup', function(e) {
121-
if (e.keyCode == 8 && input.val() == '') {
121+
input.on("keyup", function(e) {
122+
if (e.keyCode === 8 && input.val() === "") {
122123
if (!isMobileView()) {
123124
resultSwitch.off();
124125
} else {
125-
hints.removeClass('unloaded');
126+
hints.removeClass("unloaded");
126127
}
127128
} else {
128-
if (input.val() != '') {
129+
if (input.val() !== "") {
129130
resultSwitch.on();
130131

131-
if (!btnClear.hasClass('visible')) {
132-
btnClear.addClass('visable');
132+
if (!btnClear.hasClass("visible")) {
133+
btnClear.addClass("visable");
133134
}
134135

135136
if (isMobileView()) {
136-
hints.addClass('unloaded');
137+
hints.addClass("unloaded");
137138
}
138139
}
139140
}
140141
});
141142

142-
btnClear.on('click', function() {
143-
input.val('');
143+
btnClear.on("click", function() {
144+
input.val("");
144145
if (isMobileView()) {
145-
hints.removeClass('unloaded');
146+
hints.removeClass("unloaded");
146147
results.empty();
147148
} else {
148149
resultSwitch.off();
149150
}
150151
input.focus();
151-
btnClear.removeClass('visable');
152+
btnClear.removeClass("visable");
152153
});
153154

154-
});
155+
});

‎assets/js/_commons/sidebar.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ $(function() {
1111
var sidebarUtil = (function() {
1212
const ATTR_DISPLAY = "sidebar-display";
1313
var isExpanded = false;
14-
var body = $('body');
14+
var body = $("body");
1515

1616
return {
17-
toggle: function() {
18-
if (isExpanded == false) {
19-
body.attr(ATTR_DISPLAY, '');
17+
toggle() {
18+
if (isExpanded === false) {
19+
body.attr(ATTR_DISPLAY, "");
2020
} else {
2121
body.removeAttr(ATTR_DISPLAY);
2222
}
2323

2424
isExpanded = !isExpanded;
2525
}
26-
}
26+
};
2727

28-
})();
28+
}());
2929

3030
$("#sidebar-trigger").click(sidebarUtil.toggle);
3131

32-
$('#mask').click(sidebarUtil.toggle);
32+
$("#mask").click(sidebarUtil.toggle);
3333

3434
});

‎assets/js/_commons/topbar-switch.js‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,57 +11,59 @@ $(function() {
1111
var didScroll;
1212
var lastScrollTop = 0;
1313
var delta = 5;
14-
var topbarHeight = $('#topbar-wrapper').outerHeight();
15-
16-
$(window).scroll(function(event) {
17-
if ($("#topbar-title").is(":hidden")) { /* Not in small screens */
18-
didScroll = true;
19-
}
20-
});
21-
22-
setInterval(function() {
23-
if (didScroll) {
24-
hasScrolled();
25-
didScroll = false;
26-
}
27-
}, 250);
14+
var topbarHeight = $("#topbar-wrapper").outerHeight();
2815

2916
function hasScrolled() {
3017
var st = $(this).scrollTop();
3118

3219
/* Make sure they scroll more than delta */
33-
if (Math.abs(lastScrollTop - st) <= delta)
20+
if (Math.abs(lastScrollTop - st) <= delta) {
3421
return;
22+
}
3523

3624
if (st > lastScrollTop && st > topbarHeight) {
3725
/* Scroll Down */
38-
$('#topbar-wrapper').removeClass('topbar-down').addClass('topbar-up');
26+
$("#topbar-wrapper").removeClass("topbar-down").addClass("topbar-up");
3927

40-
if ( $('#toc-wrapper').length > 0) {
41-
$('#toc-wrapper').removeClass('topbar-down');
28+
if ($("#toc-wrapper").length > 0) {
29+
$("#toc-wrapper").removeClass("topbar-down");
4230
}
4331

44-
if ( $('.access').length > 0) {
45-
$('.access').removeClass('topbar-down');
32+
if ($(".access").length > 0) {
33+
$(".access").removeClass("topbar-down");
4634
}
4735

48-
if ($('#search-input').is(':focus')) {
49-
$('#search-input').blur(); /* remove focus */
36+
if ($("#search-input").is(":focus")) {
37+
$("#search-input").blur(); /* remove focus */
5038
}
5139

5240
} else {
5341
/* Scroll Up */
5442
if (st + $(window).height() < $(document).height()) {
55-
$('#topbar-wrapper').removeClass('topbar-up').addClass('topbar-down');
56-
if ( $('#toc-wrapper').length > 0) {
57-
$('#toc-wrapper').addClass('topbar-down');
43+
$("#topbar-wrapper").removeClass("topbar-up").addClass("topbar-down");
44+
if ($("#toc-wrapper").length > 0) {
45+
$("#toc-wrapper").addClass("topbar-down");
5846
}
59-
if ( $('.access').length > 0) {
60-
$('.access').addClass('topbar-down');
47+
if ($(".access").length > 0) {
48+
$(".access").addClass("topbar-down");
6149
}
6250
}
6351
}
6452

6553
lastScrollTop = st;
6654
}
55+
56+
$(window).scroll(function(event) {
57+
if ($("#topbar-title").is(":hidden")) { /* Not in small screens */
58+
didScroll = true;
59+
}
60+
});
61+
62+
setInterval(function() {
63+
if (didScroll) {
64+
hasScrolled();
65+
didScroll = false;
66+
}
67+
}, 250);
68+
6769
});

0 commit comments

Comments
 (0)