Skip to content

Commit 96760b3

Browse files
yodaggyodagg
committed
Optimize code
1 parent 9e8594f commit 96760b3

File tree

10 files changed

+208
-245
lines changed

10 files changed

+208
-245
lines changed

‎build/index.js‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,17 @@ for ( const name in rawIcons ) {
5151
})
5252
}
5353

54-
const toPath = path.resolve(__dirname, '../fontawesomepicker/asset/categories.json')
55-
fs.writeFileSync(toPath, JSON.stringify(data))
54+
// `Others' should be put last
55+
const others = data.others
56+
delete data.others
57+
data.others = others
58+
59+
60+
fs.writeFileSync(
61+
path.resolve(__dirname, '../fontawesomepicker/asset/categories.json'),
62+
JSON.stringify(data)
63+
)
64+
fs.writeFileSync(
65+
path.resolve(__dirname, '../fontawesomepicker/asset/categories.js'),
66+
`fontawesomepickerCallback(${JSON.stringify(data)})`
67+
)

‎example/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
toolbar: 'fontawesomepicker forecolor backcolor fontsizeselect formatselect',
1717
fontsize_formats: '12px 14px 16px 18px 24px 36px',
1818
external_plugins: {
19-
// fontawesomepicker: 'https://www.unpkg.com/tinymce-fontawesomepicker/fontawesomepicker/plugin.min.js'
20-
fontawesomepicker: 'http://pro/tinymce-fontawesomepicker/fontawesomepicker/plugin.js'
19+
fontawesomepicker: 'https://www.unpkg.com/tinymce-fontawesomepicker/fontawesomepicker/plugin.min.js'
20+
// fontawesomepicker: '/tinymce-fontawesomepicker/fontawesomepicker/plugin.js'
2121
},
2222
fontawesomeUrl: 'https://www.unpkg.com/@fortawesome/fontawesome-free@5.14.0/css/all.min.css'
2323
})

‎fontawesomepicker/asset/categories.js‎

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

‎fontawesomepicker/asset/categories.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎fontawesomepicker/asset/style.css‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -17,38 +17,6 @@
1717
box-sizing: border-box;
1818
}
1919

20-
.tox .mce-fontawesomepicker--toolbar {
21-
height: 60px;
22-
}
23-
24-
.tox .mce-fontawesomepicker--color,
25-
.tox .mce-fontawesomepicker--size {
26-
height: 30px;
27-
}
28-
29-
.tox .mce-fontawesomepicker--color span,
30-
.tox .mce-fontawesomepicker--size span {
31-
font-size: 14px;
32-
}
33-
34-
.tox .mce-fontawesomepicker--color input,
35-
.tox .mce-fontawesomepicker--size input {
36-
font-size: 12px;
37-
float: right;
38-
}
39-
40-
.tox .mce-fontawesomepicker--color input {
41-
width: 45px;
42-
height: 30px;
43-
}
44-
45-
.tox .mce-fontawesomepicker--size input {
46-
border: 1px solid #ccc;
47-
padding: 2px 2px 2px 5px;
48-
box-sizing: border-box;
49-
width: 60px;
50-
height: 25px;
51-
}
5220

5321
.tox .mce-fontawesomepicker--icons {
5422
overflow: auto;
@@ -72,11 +40,10 @@
7240

7341
.tox .mce-fontawesomepicker--nav {
7442
width: 100%;
75-
height: calc(100% - 70px);
43+
height: 100%;
7644
font-size: 14px;
7745
overflow: hidden;
7846
overflow-y: auto;
79-
margin-top: 10px;
8047
}
8148

8249
.tox .mce-fontawesomepicker--nav__item {

0 commit comments

Comments
 (0)