alex/yomichan
1
Fork 0
Code Releases Activity

Temporarily removing gecko code from master until everything works in

Browse Source 
firefox branch.

This reverts commit 30585892b8, reversing
changes made to bd89db4ec5.
This commit is contained in:
Alex Yatskov 2016-07-06 19:56:13 -07:00
parent 80d2eac33c
commit abb3d74142
7 changed files with 3 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ext/bg/background.html
View File

@ -1,7 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<body> <body>
<script src="js/polyfill-gecko.js"></script>
<script src="../lib/handlebars.min.js"></script> <script src="../lib/handlebars.min.js"></script>
<script src="js/templates.js"></script> <script src="js/templates.js"></script>
<script src="js/dictionary.js"></script> <script src="js/dictionary.js"></script>

15
ext/bg/js/polyfill-gecko.js
View File

@ -1,15 +0,0 @@
// Gecko does not currently support chrome.storage.sync, use storage.local instead
// https://bugzilla.mozilla.org/show_bug.cgi?id=1220494
if (!chrome.storage.sync) {
chrome.storage.sync = chrome.storage.local;
}
// Gecko does not currently support chrome.runtime.onInstalled, just ignore calls to it
// (https://bugzilla.mozilla.org/show_bug.cgi?id=1252871)
if (!chrome.runtime.onInstalled) {
chrome.runtime.onInstalled = {
'addListener' : function(){},
'hasListener' : function(){},
'removeListener' : function(){}
};
}

10
ext/bg/js/translator.js
View File

@ -46,17 +46,8 @@ class Translator {
const pendingLoads = []; const pendingLoads = [];
for (let key of files) { for (let key of files) {
/*
Spidermonkey does not implement lexical bindings for for-of loop
(see https://bugzilla.mozilla.org/show_bug.cgi?id=449811)
so we need to manually make a new declaration for key.
Otherwise key will always remain the same in the callback to loadData
and the dictionary data will not be set correctly
*/
let key_ = key;
pendingLoads.push(key); pendingLoads.push(key);
Translator.loadData(this.paths[key], (response) => { Translator.loadData(this.paths[key], (response) => {
let key = key_
switch (key) { switch (key) {
case 'rules': case 'rules':
this.deinflector.setRules(JSON.parse(response)); this.deinflector.setRules(JSON.parse(response));
@ -237,7 +228,6 @@ class Translator {
static loadData(url, callback) { static loadData(url, callback) {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.overrideMimeType("application/json");
xhr.addEventListener('load', () => callback(xhr.responseText)); xhr.addEventListener('load', () => callback(xhr.responseText));
xhr.open('GET', chrome.extension.getURL(url), true); xhr.open('GET', chrome.extension.getURL(url), true);
xhr.send(); xhr.send();

1
ext/bg/options.html
View File

@ -163,7 +163,6 @@
<script src="../lib/jquery-2.2.2.min.js"></script> <script src="../lib/jquery-2.2.2.min.js"></script>
<script src="../lib/bootstrap-3.3.6-dist/js/bootstrap.min.js"></script> <script src="../lib/bootstrap-3.3.6-dist/js/bootstrap.min.js"></script>
<script src="js/polyfill-gecko.js"></script>
<script src="js/options.js"></script> <script src="js/options.js"></script>
<script src="js/options-form.js"></script> <script src="js/options-form.js"></script>
</body> </body>

7
ext/fg/js/popup.js
View File

@ -58,12 +58,9 @@ class Popup {
} }
setContent(content) { setContent(content) {
if (this.popup === null) { if (this.popup !== null) {
return; this.popup.srcdoc = content;
} }
const doc = this.popup;
doc.srcdoc=content;
} }
sendMessage(action, params, callback) { sendMessage(action, params, callback) {

13
ext/fg/js/range.js
View File

@ -16,19 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
// Polyfill caretRangeFromPoint() using the newer caretPositionFromPoint()
if (!document.caretRangeFromPoint){
document.caretRangeFromPoint = function polyfillcaretRangeFromPoint(x,y){
let range = document.createRange();
let position = document.caretPositionFromPoint(x,y);
if (!position) {
return null;
}
range.setStart(position.offsetNode, position.offset);
range.setEnd(position.offsetNode, position.offset);
return range;
};
}
class Range { class Range {
constructor(range) { constructor(range) {

7
ext/manifest.json
View File

@ -28,10 +28,5 @@
"fg/js/frame.js", "fg/js/frame.js",
"fg/ttf/kanji-stroke-orders.ttf", "fg/ttf/kanji-stroke-orders.ttf",
"fg/ttf/vl-gothic-regular.ttf" "fg/ttf/vl-gothic-regular.ttf"
], ]
"applications": {
"gecko": {
"id": "yomichan-gecko@example.com"
}
}
} }