Skip to content

Commit 0bf1bbf

Browse files
committed
Using PJAX + NProgress
1 parent 8496388 commit 0bf1bbf

4 files changed

Lines changed: 40 additions & 28 deletions

File tree

assets/js/main.js

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
(function () {
2-
function getFileNameFromUri(uri) {
3-
var pathName = uri.split("/");
4-
if (pathName.length > 0) {
5-
return pathName[pathName.length - 1];
6-
}
7-
return "";
8-
}
9-
102
var currentFileName = getFileNameFromUri(window.location.pathname);
11-
$(".sub-nav a").each(function() {
3+
$(".sub-nav").find('a').each(function() {
124
if (getFileNameFromUri(this.href) === currentFileName) {
135
$(this)
146
.click(function(){
@@ -17,4 +9,21 @@
179
.parent().addClass("active");
1810
}
1911
});
12+
13+
function getFileNameFromUri(uri) {
14+
var pathName = uri.split("/");
15+
if (pathName.length > 0) {
16+
return pathName[pathName.length - 1];
17+
}
18+
return "";
19+
}
20+
21+
$(document)
22+
.pjax('a', '#pjax-container', {fragment: '#pjax-container'})
23+
.on('pjax:start', function () {
24+
NProgress.start();
25+
})
26+
.on('pjax:end', function () {
27+
NProgress.done();
28+
});
2029
}());

template/about.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,4 @@ block prepend scripts
111111
script(src="assets/vendor/nprogress/nprogress.js")
112112
script(src="assets/vendor/bootstrap/dist/js/bootstrap.min.js")
113113
script(src="assets/vendor/github-buttons/dist/github-buttons.js")
114+
script(src="assets/js/main.js")

template/index.jade

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ block prepend scripts
3030
script(src="assets/vendor/jquery-pjax/jquery.pjax.js")
3131
script(src="assets/vendor/nprogress/nprogress.js")
3232
script(src="assets/vendor/bootstrap/dist/js/bootstrap.min.js")
33+
script(src="assets/js/main.js")

template/layout.jade

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,26 @@ html
1010
body
1111
a.sr-only(href="#main") SKIP TO CONTENT
1212

13-
div#header.navbar.navbar-fixed-top.navbar-inverse
14-
div.container
15-
div.navbar-header
16-
block brand
17-
18-
button.navbar-toggle(type="button", data-toggle="collapse", data-target=".navigation")
19-
span.sr-only Toggle Navigation
20-
span.icon-bar
21-
span.icon-bar
22-
span.icon-bar
23-
div.navbar-collapse.collapse.navigation
24-
!= menu
25-
26-
27-
div.container#main
28-
div.row.wrap
29-
block row
30-
div.footer
31-
!= footer
13+
div#pjax-container
14+
div#header.navbar.navbar-fixed-top.navbar-inverse
15+
div.container
16+
div.navbar-header
17+
block brand
18+
19+
button.navbar-toggle(type="button", data-toggle="collapse", data-target=".navigation")
20+
span.sr-only Toggle Navigation
21+
span.icon-bar
22+
span.icon-bar
23+
span.icon-bar
24+
div.navbar-collapse.collapse.navigation
25+
!= menu
26+
27+
28+
div.container#main
29+
div.row.wrap
30+
block row
31+
div.footer
32+
!= footer
3233

3334
block scripts
3435

0 commit comments

Comments
 (0)