Skip to content

Commit c2753a8

Browse files
committed
some long needed refactoring
1 parent 569fd66 commit c2753a8

File tree

5 files changed

+93
-144
lines changed

5 files changed

+93
-144
lines changed

manifest.json

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
{
22
"update_url": "https://clients2.google.com/service/update2/crx",
3-
4-
"manifest_version": 2,
5-
3+
"manifest_version": 3,
64
"name": "JapaneseTab",
75
"short_name": "JTab",
86
"description": "Learn Japanese in every new tab without even realizing it!",
9-
"version": "1.0.6",
10-
"content_security_policy": "script-src 'self' https://www.google-analytics.com; object-src 'self'",
7+
"version": "1.0.7",
118
"chrome_url_overrides": {"newtab": "vocab.html"},
129

1310
"permissions": [
14-
"activeTab",
15-
"topSites",
16-
"https://jisho.org/api/*",
17-
"https://unpkg.com/wanakana",
18-
"storage"
19-
20-
],
21-
"browser_action": {
22-
"default_icon": "icon.png",
23-
"default_popup": "popup.html"
24-
}
11+
"activeTab",
12+
"topSites",
13+
"storage"
14+
],
15+
"host_permissions": [
16+
"https://jisho.org/api/*"
17+
],
18+
"action": {
19+
"default_icon": "icon.png",
20+
"default_popup": "popup.html"
21+
}
2522
}

vocab.html

Lines changed: 45 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -4,86 +4,56 @@
44
<meta charset="UTF-8">
55
<meta content-type="text/html">
66
<link rel="stylesheet" type="text/css" href="vocab.css">
7-
<script src="jquery-3.3.1.min.js" type="text/javascript">
8-
</script>
7+
<script src="jquery-3.3.1.min.js" type="text/javascript"></script>
8+
<script src="wanakana.min.js" type="text/javascript"></script>
9+
<script src="wordList.js" type="text/javascript"></script>
910
</head>
1011

11-
<body id="body">
12-
13-
<div style="text-align:center;">
14-
15-
<h1 class="romaji" id="romaji"></h1>
16-
<div>
17-
18-
<div class="hiraganaclass">
19-
<a class="hiragana" id="hiragana"></a>
20-
<a class="audio" id="audio"></a>
12+
<body id="body">
13+
<div style="text-align:center;">
14+
<h1 class="romaji" id="romaji"></h1>
15+
<div>
16+
<div class="hiraganaclass">
17+
<a class="hiragana" id="hiragana"></a>
18+
<a class="audio" id="audio"></a>
19+
</div>
20+
<div class = "kaclass">
21+
<a class="kanji" id="kanji"></a>
22+
<a class="dot"></a>
23+
<a class="katakana" id="katakana"></a>
24+
</div>
25+
<p class="definition" id="definition"></p>
26+
<div class = "pronounciation_pos">
27+
<a class="pos" id="part of speech"></a>
28+
</div>
29+
</div>
30+
2131
</div>
32+
33+
<div style="align-items:center; visibility:visible;" id="mostVisited_div" class="most_visited"></div>
2234

23-
<div class = "kaclass">
24-
<a class="kanji" id="kanji"></a>
25-
<a class="dot"></a>
26-
<a class="katakana" id="katakana"></a>
27-
</div>
28-
29-
<p class="definition" id="definition"></p>
30-
31-
<div class = "pronounciation_pos">
32-
<a class="pos" id="part of speech"></a>
35+
<!-- Options -->
36+
<div id="goToOptions">
37+
<div id="optionsImg"></div>
38+
<div id="romajiCheck"></div>
39+
<div id="topText"></div>
3340
</div>
34-
</div>
35-
36-
</div>
37-
38-
<div style="align-items:center; visibility:visible;" id="mostVisited_div" class="most_visited"></div>
39-
40-
<!-- Options -->
41-
<div id="goToOptions">
42-
<div id="optionsImg"></div>
43-
<div id="romajiCheck"></div>
44-
<div id="topText"></div>
45-
</div>
46-
47-
<div id="toggleLinks"></div>
48-
<div class="colourSwatch">
49-
50-
<div class="upperSwatch">
51-
<div class="colourBlock" id="yellowlight"></div>
52-
<div class="colourBlock" id="orangelight"></div>
53-
<div class="colourBlock" id="pinklight"></div>
54-
<div class="colourBlock" id="pink"></div>
55-
</div>
5641

57-
<div class="lowerSwatch">
58-
<div class="colourBlock" id="pinkdark"></div>
59-
<div class="colourBlock" id="purplelight"></div>
60-
<div class="colourBlock" id="bluelight"></div>
61-
<div class="colourBlock" id="greenlight"></div>
42+
<div id="toggleLinks"></div>
43+
<div class="colourSwatch">
44+
<div class="upperSwatch">
45+
<div class="colourBlock" id="yellowlight"></div>
46+
<div class="colourBlock" id="orangelight"></div>
47+
<div class="colourBlock" id="pinklight"></div>
48+
<div class="colourBlock" id="pink"></div>
49+
</div>
50+
<div class="lowerSwatch">
51+
<div class="colourBlock" id="pinkdark"></div>
52+
<div class="colourBlock" id="purplelight"></div>
53+
<div class="colourBlock" id="bluelight"></div>
54+
<div class="colourBlock" id="greenlight"></div>
55+
</div>
6256
</div>
63-
64-
</div>
65-
66-
</body>
67-
68-
<script src="vocab.js" type="text/javascript">
69-
70-
// Google Analytics Code
71-
var _AnalyticsCode = 'UA-84005100-1';//instead XXX my number
72-
73-
var _gaq = _gaq || [];
74-
_gaq.push(['_setAccount', _AnalyticsCode]);
75-
_gaq.push(['_trackPageview']);
76-
77-
(function () {
78-
var ga = document.createElement('script');
79-
ga.type = 'text/javascript';
80-
ga.async = true;
81-
ga.src = 'https://ssl.google-analytics.com/ga.js';
82-
var s = document.getElementsByTagName('script')[0];
83-
s.parentNode.insertBefore(ga, s);
84-
})();
85-
86-
87-
</script>
88-
57+
</body>
58+
<script src="vocab.js" type="text/javascript"></script>
8959
</html>

vocab.js

Lines changed: 18 additions & 53 deletions
Large diffs are not rendered by default.

wanakana.min.js

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

wordList.js

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

0 commit comments

Comments
 (0)