Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
T
Taiko Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Taiko Web
Commits
4d370762
Commit
4d370762
authored
Mar 09, 2020
by
LoveEevee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use Font Loading API instead of FontDetect
parent
9248a521
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
28 deletions
+12
-28
public/assets/fonts/fonts.css
public/assets/fonts/fonts.css
+0
-8
public/src/js/assets.js
public/src/js/assets.js
+4
-6
public/src/js/browsersupport.js
public/src/js/browsersupport.js
+3
-0
public/src/js/lib/fontdetect.min.js
public/src/js/lib/fontdetect.min.js
+0
-1
public/src/js/loader.js
public/src/js/loader.js
+5
-13
No files found.
public/assets/fonts/fonts.css
deleted
100644 → 0
View file @
9248a521
@font-face
{
font-family
:
TnT
;
src
:
url("TnT.ttf")
format
(
"truetype"
);
}
@font-face
{
font-family
:
Kozuka
;
src
:
url("Kozuka.otf")
format
(
"truetype"
);
}
\ No newline at end of file
public/src/js/assets.js
View file @
4d370762
var
assets
=
{
var
assets
=
{
"
js
"
:
[
"
js
"
:
[
"
lib/fontdetect.min.js
"
,
"
lib/md5.min.js
"
,
"
lib/md5.min.js
"
,
"
loadsong.js
"
,
"
loadsong.js
"
,
"
parseosu.js
"
,
"
parseosu.js
"
,
...
@@ -44,7 +43,6 @@ var assets = {
...
@@ -44,7 +43,6 @@ var assets = {
"
view.css
"
"
view.css
"
],
],
"
assetsCss
"
:
[
"
assetsCss
"
:
[
"
fonts/fonts.css
"
,
"
img/img.css
"
"
img/img.css
"
],
],
"
img
"
:
[
"
img
"
:
[
...
@@ -126,10 +124,10 @@ var assets = {
...
@@ -126,10 +124,10 @@ var assets = {
"
bgm_setsume.mp3
"
,
"
bgm_setsume.mp3
"
,
"
bgm_settings.mp3
"
"
bgm_settings.mp3
"
],
],
"
fonts
"
:
[
"
fonts
"
:
{
"
Kozuka
"
,
"
Kozuka
"
:
"
Kozuka.otf
"
,
"
TnT
"
"
TnT
"
:
"
TnT.ttf
"
]
,
}
,
"
views
"
:
[
"
views
"
:
[
"
game.html
"
,
"
game.html
"
,
"
loadsong.html
"
,
"
loadsong.html
"
,
...
...
public/src/js/browsersupport.js
View file @
4d370762
...
@@ -47,6 +47,9 @@ function browserSupport(){
...
@@ -47,6 +47,9 @@ function browserSupport(){
var
el
=
document
.
createElement
(
"
a
"
)
var
el
=
document
.
createElement
(
"
a
"
)
el
.
style
.
setProperty
(
"
--a
"
,
1
)
el
.
style
.
setProperty
(
"
--a
"
,
1
)
return
el
.
style
.
length
!==
0
return
el
.
style
.
length
!==
0
},
"
Font Loading API
"
:
function
(){
return
typeof
FontFace
===
"
function
"
}
}
}
}
failedTests
=
[]
failedTests
=
[]
...
...
public/src/js/lib/fontdetect.min.js
deleted
100644 → 0
View file @
9248a521
FontDetect
=
function
(){
function
e
(){
if
(
!
n
){
n
=!
0
;
var
e
=
document
.
body
,
t
=
document
.
body
.
firstChild
,
i
=
document
.
createElement
(
"
div
"
);
i
.
id
=
"
fontdetectHelper
"
,
r
=
document
.
createElement
(
"
span
"
),
r
.
innerText
=
"
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
"
,
i
.
appendChild
(
r
),
e
.
insertBefore
(
i
,
t
),
i
.
style
.
position
=
"
absolute
"
,
i
.
style
.
visibility
=
"
hidden
"
,
i
.
style
.
top
=
"
-200px
"
,
i
.
style
.
left
=
"
-100000px
"
,
i
.
style
.
width
=
"
100000px
"
,
i
.
style
.
height
=
"
200px
"
,
i
.
style
.
fontSize
=
"
100px
"
}}
function
t
(
e
,
t
){
return
e
instanceof
Element
?
window
.
getComputedStyle
(
e
).
getPropertyValue
(
t
):
window
.
jQuery
?
$
(
e
).
css
(
t
):
""
}
var
n
=!
1
,
i
=
[
"
serif
"
,
"
sans-serif
"
,
"
monospace
"
,
"
cursive
"
,
"
fantasy
"
],
r
=
null
;
return
{
onFontLoaded
:
function
(
t
,
i
,
r
,
o
){
if
(
t
){
var
s
=
o
&&
o
.
msInterval
?
o
.
msInterval
:
100
,
a
=
o
&&
o
.
msTimeout
?
o
.
msTimeout
:
2
e3
;
if
(
i
||
r
){
if
(
n
||
e
(),
this
.
isFontLoaded
(
t
))
return
void
(
i
&&
i
(
t
));
var
l
=
this
,
f
=
(
new
Date
).
getTime
(),
d
=
setInterval
(
function
(){
if
(
l
.
isFontLoaded
(
t
))
return
clearInterval
(
d
),
void
i
(
t
);
var
e
=
(
new
Date
).
getTime
();
e
-
f
>
a
&&
(
clearInterval
(
d
),
r
&&
r
(
t
))},
s
)}}},
isFontLoaded
:
function
(
t
){
var
o
=
0
,
s
=
0
;
n
||
e
();
for
(
var
a
=
0
;
a
<
i
.
length
;
++
a
){
if
(
r
.
style
.
fontFamily
=
'
"
'
+
t
+
'
",
'
+
i
[
a
],
o
=
r
.
offsetWidth
,
a
>
0
&&
o
!=
s
)
return
!
1
;
s
=
o
}
return
!
0
},
whichFont
:
function
(
e
){
for
(
var
n
=
t
(
e
,
"
font-family
"
),
r
=
n
.
split
(
"
,
"
),
o
=
r
.
shift
();
o
;){
o
=
o
.
replace
(
/^
\s
*
[
'"
]?\s
*
([^
'"
]
*
)\s
*
[
'"
]?\s
*$/
,
"
$1
"
);
for
(
var
s
=
0
;
s
<
i
.
length
;
s
++
)
if
(
o
==
i
[
s
])
return
o
;
if
(
this
.
isFontLoaded
(
o
))
return
o
;
o
=
r
.
shift
()}
return
null
}}}();
public/src/js/loader.js
View file @
4d370762
...
@@ -71,12 +71,11 @@ class Loader{
...
@@ -71,12 +71,11 @@ class Loader{
checkStyles
()
checkStyles
()
}))
}))
assets
.
fonts
.
forEach
(
name
=>
{
for
(
var
name
in
assets
.
fonts
){
var
font
=
document
.
createElement
(
"
h1
"
)
this
.
addPromise
(
new
FontFace
(
name
,
"
url('
"
+
gameConfig
.
assets_baseurl
+
"
fonts/
"
+
assets
.
fonts
[
name
]
+
"
')
"
).
load
().
then
(
font
=>
{
font
.
style
.
fontFamily
=
name
document
.
fonts
.
add
(
font
)
font
.
appendChild
(
document
.
createTextNode
(
"
I am a font
"
))
}))
this
.
assetsDiv
.
appendChild
(
font
)
}
})
assets
.
img
.
forEach
(
name
=>
{
assets
.
img
.
forEach
(
name
=>
{
var
id
=
this
.
getFilename
(
name
)
var
id
=
this
.
getFilename
(
name
)
...
@@ -106,7 +105,6 @@ class Loader{
...
@@ -106,7 +105,6 @@ class Loader{
this
.
afterJSCount
=
this
.
afterJSCount
=
[
"
blurPerformance
"
,
"
P2Connection
"
].
length
+
[
"
blurPerformance
"
,
"
P2Connection
"
].
length
+
assets
.
fonts
.
length
+
assets
.
audioSfx
.
length
+
assets
.
audioSfx
.
length
+
assets
.
audioMusic
.
length
+
assets
.
audioMusic
.
length
+
assets
.
audioSfxLR
.
length
+
assets
.
audioSfxLR
.
length
+
...
@@ -131,12 +129,6 @@ class Loader{
...
@@ -131,12 +129,6 @@ class Loader{
this
.
afterJSCount
=
0
this
.
afterJSCount
=
0
assets
.
fonts
.
forEach
(
name
=>
{
this
.
addPromise
(
new
Promise
(
resolve
=>
{
FontDetect
.
onFontLoaded
(
name
,
resolve
,
resolve
,
{
msTimeout
:
Infinity
})
}))
})
assets
.
audioSfx
.
forEach
(
name
=>
{
assets
.
audioSfx
.
forEach
(
name
=>
{
this
.
addPromise
(
this
.
loadSound
(
name
,
snd
.
sfxGain
))
this
.
addPromise
(
this
.
loadSound
(
name
,
snd
.
sfxGain
))
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment