renaming files

This commit is contained in:
Alex Yatskov 2017-08-14 19:55:04 -07:00
parent 8b50dfe1e9
commit 82863cd861
10 changed files with 24 additions and 21 deletions

View File

@ -38,6 +38,6 @@
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>
<script src="/mixed/js/request.js"></script> <script src="/mixed/js/request.js"></script>
<script src="/bg/js/popup.js"></script> <script src="/bg/js/context.js"></script>
</body> </body>
</html> </html>

View File

@ -17,7 +17,7 @@
*/ */
window.yomichan_window = new class extends Display { class DisplaySearch extends Display {
constructor() { constructor() {
super($('#spinner'), $('#content')); super($('#spinner'), $('#content'));
@ -51,4 +51,6 @@ window.yomichan_window = new class extends Display {
this.onError(e); this.onError(e);
} }
} }
}; }
window.yomichan_search = new DisplaySearch();

View File

@ -5,7 +5,7 @@
<title>Yomichan Search</title> <title>Yomichan Search</title>
<link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css"> <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
<link rel="stylesheet" type="text/css" href="/mixed/css/frame.css"> <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container-fluid">
@ -45,6 +45,6 @@
<script src="/mixed/js/display.js"></script> <script src="/mixed/js/display.js"></script>
<script src="/mixed/js/japanese.js"></script> <script src="/mixed/js/japanese.js"></script>
<script src="/bg/js/display-window.js"></script> <script src="/bg/js/search.js"></script>
</body> </body>
</html> </html>

View File

@ -17,7 +17,7 @@
*/ */
iframe#yomichan-popup { iframe#yomichan-float {
all: initial; all: initial;
background-color: #fff; background-color: #fff;
border: 1px solid #999; border: 1px solid #999;

View File

@ -5,7 +5,7 @@
<title></title> <title></title>
<link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css"> <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css"> <link rel="stylesheet" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
<link rel="stylesheet" href="/mixed/css/frame.css"> <link rel="stylesheet" href="/mixed/css/display.css">
<style type="text/css"> <style type="text/css">
.entry, .note { .entry, .note {
padding-left: 10px; padding-left: 10px;
@ -30,14 +30,14 @@
</div> </div>
</div> </div>
<script src="/fg/js/api.js"></script>
<script src="/fg/js/dictionary.js"></script>
<script src="/fg/js/util.js"></script>
<script src="/mixed/js/audio.js"></script>
<script src="/mixed/js/display.js"></script>
<script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/jquery.min.js"></script>
<script src="/mixed/lib/wanakana.min.js"></script> <script src="/mixed/lib/wanakana.min.js"></script>
<script src="/fg/js/display-frame.js"></script> <script src="/fg/js/api.js"></script>
<script src="/fg/js/util.js"></script>
<script src="/mixed/js/audio.js"></script>
<script src="/mixed/js/display.js"></script>
<script src="/fg/js/float.js"></script>
</body> </body>
</html> </html>

View File

@ -17,10 +17,10 @@
*/ */
window.yomichan_frame = new class extends Display { class DisplayFloat extends Display {
constructor() { constructor() {
super($('#spinner'), $('#definitions')); super($('#spinner'), $('#definitions'));
$(window).on('message', this.onMessage.bind(this)); $(window).on('message', e => this.onMessage(e));
} }
onError(error) { onError(error) {
@ -83,4 +83,6 @@ window.yomichan_frame = new class extends Display {
super.onKeyDown(e); super.onKeyDown(e);
} }
} }
}; }
window.yomichan_display = new DisplayFloat();

View File

@ -20,10 +20,10 @@
class Popup { class Popup {
constructor() { constructor() {
this.container = document.createElement('iframe'); this.container = document.createElement('iframe');
this.container.id = 'yomichan-popup'; this.container.id = 'yomichan-float';
this.container.addEventListener('mousedown', e => e.stopPropagation()); this.container.addEventListener('mousedown', e => e.stopPropagation());
this.container.addEventListener('scroll', e => e.stopPropagation()); this.container.addEventListener('scroll', e => e.stopPropagation());
this.container.setAttribute('src', chrome.extension.getURL('/fg/frame.html')); this.container.setAttribute('src', chrome.extension.getURL('/fg/float.html'));
this.container.style.width = '0px'; this.container.style.width = '0px';
this.container.style.height = '0px'; this.container.style.height = '0px';
this.injected = null; this.injected = null;

View File

@ -7,7 +7,7 @@
"icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"}, "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
"browser_action": { "browser_action": {
"default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"}, "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"},
"default_popup": "bg/popup.html" "default_popup": "bg/context.html"
}, },
"author": "Alex Yatskov", "author": "Alex Yatskov",
@ -20,7 +20,6 @@
"fg/js/popup.js", "fg/js/popup.js",
"fg/js/source.js", "fg/js/source.js",
"fg/js/util.js", "fg/js/util.js",
"fg/js/frontend.js" "fg/js/frontend.js"
], ],
"css": ["fg/css/client.css"] "css": ["fg/css/client.css"]
@ -48,7 +47,7 @@
"description": "Open search window" "description": "Open search window"
} }
}, },
"web_accessible_resources": ["fg/frame.html"], "web_accessible_resources": ["fg/float.html"],
"applications": { "applications": {
"gecko": { "gecko": {
"id": "yomichan-live@foosoft.net", "id": "yomichan-live@foosoft.net",