Skip to content

Commit b66c4d7

Browse files
committed
badge.js: C++バージョンバッジのbase_urlを遅延で再設定
1 parent ef44d54 commit b66c4d7

File tree

3 files changed

+22
-7
lines changed

3 files changed

+22
-7
lines changed

js/kunai.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ class Kunai {
107107

108108
async onDatabase(db) {
109109
// this.log.debug(`onDatabase`, db)
110+
UI.Badge.onDatabase(db)
110111
await this.ui.sidebar.onDatabase(db)
111112
await this.ui.sidebar.treeview.onPageID(this.meta.page_id)
112113
}

js/kunai/ui.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export {Content} from './ui/content'
22
export {Sidebar} from './ui/sidebar'
33
export {Navbar} from './ui/navbar'
4-
4+
import * as Badge from './ui/badge'
5+
export {Badge}

js/kunai/ui/badge.js

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
let base_url = null
2+
const unresolved_links = []
3+
4+
const onDatabase = (db) => {
5+
base_url = db.base_url.toString()
6+
for (let a_elem of unresolved_links)
7+
a_elem.attr('href', base_url.replace(/\/$/, '') + a_elem.attr('href'))
8+
unresolved_links.length = 0
9+
}
10+
111
const sanitize = (badges) => {
212
let i = 0
313

@@ -46,15 +56,18 @@ const sanitize = (badges) => {
4656
const lang_path = cppv ? `/lang/cpp${cppv}` :
4757
named_version ? `/lang/${named_version}` :
4858
`/lang`
59+
const a_elem = $('<a>', {href: `${lang_path}.html`})
60+
.append($('<i>'))
61+
// .append($('<span>').text(clean_txt))
62+
.appendTo(b.empty())
4963

50-
b.empty().append(
51-
$('<a>', {href: `${lang_path}.html`})
52-
.append($('<i>'))
53-
// .append($('<span>').text(clean_txt))
54-
)
64+
if (base_url)
65+
a_elem.attr('href', base_url.replace(/\/$/, '') + a_elem.attr('href'))
66+
else
67+
unresolved_links.push(a_elem)
5568
}
5669
return i
5770
}
5871

59-
export {sanitize}
72+
export {onDatabase, sanitize}
6073

0 commit comments

Comments
 (0)