Skip to content

Commit e582734

Browse files
authored
Merge pull request #209 from gatewayapps/bug/202/fix-css-issue
fix: 202 -fix css issue
2 parents b5335c0 + 340167b commit e582734

File tree

6 files changed

+33
-17
lines changed

6 files changed

+33
-17
lines changed

app.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
const createFilters = require('./lib/createFilters')
2-
const populateUrlMetadata = require('./lib/populateUrlMetadata')
3-
41
var token = ''
52
var repoList = []
63
var intervalIds = []
@@ -42,7 +39,6 @@ function initializeExtension() {
4239
}
4340

4441
intervalIds.forEach(clearInterval)
45-
4642
saveAppliedFilters({ currentRepo, issueNumber, organization, url })
4743

4844
const kaminoButton = $(Handlebars.templates.button().replace(/(\r\n|\n|\r)/gm, ''))
@@ -120,7 +116,7 @@ function saveAppliedFilters(urlMetadata) {
120116
filters: [],
121117
},
122118
(item) => {
123-
const filters = createFilters(newFilter, item)
119+
const { filters, changed } = createFilters(newFilter, item)
124120

125121
// only save if changed, otherwise the max quota per minute will be exceeded throwing errors
126122
if (changed) {

css/style.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,19 +213,20 @@ a {
213213
display: none;
214214
}
215215

216-
.open {
217-
display: inline;
216+
.sidebar-kamino .open {
217+
display: block;
218218
}
219219

220220
button.close {
221221
-webkit-appearance: none;
222+
appearance: none;
222223
padding: 0;
223224
cursor: pointer;
224225
background: 0 0;
225226
border: 0;
226227
}
227228

228-
.close {
229+
.modal-header .close {
229230
float: right;
230231
font-size: 21px;
231232
font-weight: 700;

lib/createFilters.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ function createFilters(newFilter, item) {
2121
item.filters.push(newFilter)
2222
}
2323

24-
return item.filters
24+
return { filters: item.filters, changed }
2525
}
2626

27-
module.exports = createFilters
27+
module.exports = createFilters;

lib/populateUrlMetadata.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ function populateUrlMetadata(href) {
1818
return { error: 'Cannot parse this url' }
1919
}
2020

21-
module.exports = populateUrlMetadata
21+
module.exports = populateUrlMetadata;

manifest.json

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,28 @@
44
{
55
"matches": ["*://github.com/*/*/issues"],
66
"exclude_matches": ["*://github.com/*/*/issues/*"],
7-
"js": ["./jquery/jquery-3.6.0.min.js", "./handlebars.runtime.min-v4.7.7.js", "./batch.js", "./template.js"],
7+
"js": [
8+
"./jquery/jquery-3.6.0.min.js",
9+
"./handlebars.runtime.min-v4.7.7.js",
10+
"./lib/populateUrlMetadata.js",
11+
"./lib/createFilters.js",
12+
"./batch.js",
13+
"./template.js"
14+
],
815
"css": ["./css/style.css"],
916
"run_at": "document_end"
1017
},
1118
{
1219
"matches": ["*://github.com/*/*/issues/*"],
1320
"exclude_matches": ["*://github.com/*/*/issues"],
14-
"js": ["./jquery/jquery-3.6.0.min.js", "./handlebars.runtime.min-v4.7.7.js", "./app.js", "./template.js"],
21+
"js": [
22+
"./jquery/jquery-3.6.0.min.js",
23+
"./handlebars.runtime.min-v4.7.7.js",
24+
"./lib/populateUrlMetadata.js",
25+
"./lib/createFilters.js",
26+
"./app.js",
27+
"./template.js"
28+
],
1529
"css": ["./css/style.css"],
1630
"run_at": "document_end"
1731
}
@@ -28,7 +42,7 @@
2842
"options_page": "options.html",
2943
"permissions": ["tabs", "background", "scripting", "storage", "webNavigation"],
3044
"host_permissions": ["*://github.com/*"],
31-
"version": "4.0.0",
45+
"version": "4.0.1",
3246
"web_accessible_resources": [
3347
{
3448
"resources": [
@@ -38,6 +52,8 @@
3852
"./css/options.css",
3953
"jquery/jquery-3.6.0.min.js",
4054
"handlebars.runtime.min-v4.7.7.js",
55+
"lib/populateUrlMetadata.js",
56+
"lib/createFilters.js",
4157
"template.js",
4258
"app.js",
4359
"options.html",

tests/createFilters.spec.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ describe('createFilter', () => {
1818
],
1919
}
2020

21-
const filters = createFilters(newFilter, existingFilters)
21+
const {changed, filters} = createFilters(newFilter, existingFilters)
2222
expect(filters).toHaveLength(2)
23+
expect(changed).toBeTruthy()
2324
expect(filters[1].filter).toEqual('test-filter')
2425
})
2526

@@ -40,8 +41,9 @@ describe('createFilter', () => {
4041
],
4142
}
4243

43-
const filters = createFilters(newFilter, existingFilters)
44+
const {changed, filters} = createFilters(newFilter, existingFilters)
4445
expect(filters).toHaveLength(1)
46+
expect(changed).toBeTruthy()
4547
expect(filters[0].filter).toEqual('test-filter')
4648
})
4749

@@ -62,8 +64,9 @@ describe('createFilter', () => {
6264
],
6365
}
6466

65-
const filters = createFilters(newFilter, existingFilters)
67+
const {changed, filters} = createFilters(newFilter, existingFilters)
6668
expect(filters).toHaveLength(1)
69+
expect(changed).toEqual(false)
6770
expect(filters[0].filter).toEqual('test-filter')
6871
})
6972
})

0 commit comments

Comments
 (0)