Temporarily removing gecko code from master until everything works in
firefox branch. This reverts commit30585892b8
, reversing changes made tobd89db4ec5
.
This commit is contained in:
parent
80d2eac33c
commit
abb3d74142
@ -1,7 +1,6 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<body>
|
||||
<script src="js/polyfill-gecko.js"></script>
|
||||
<script src="../lib/handlebars.min.js"></script>
|
||||
<script src="js/templates.js"></script>
|
||||
<script src="js/dictionary.js"></script>
|
||||
|
@ -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(){}
|
||||
};
|
||||
}
|
@ -46,17 +46,8 @@ class Translator {
|
||||
|
||||
const pendingLoads = [];
|
||||
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);
|
||||
Translator.loadData(this.paths[key], (response) => {
|
||||
let key = key_
|
||||
switch (key) {
|
||||
case 'rules':
|
||||
this.deinflector.setRules(JSON.parse(response));
|
||||
@ -237,7 +228,6 @@ class Translator {
|
||||
|
||||
static loadData(url, callback) {
|
||||
const xhr = new XMLHttpRequest();
|
||||
xhr.overrideMimeType("application/json");
|
||||
xhr.addEventListener('load', () => callback(xhr.responseText));
|
||||
xhr.open('GET', chrome.extension.getURL(url), true);
|
||||
xhr.send();
|
||||
|
@ -163,7 +163,6 @@
|
||||
|
||||
<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="js/polyfill-gecko.js"></script>
|
||||
<script src="js/options.js"></script>
|
||||
<script src="js/options-form.js"></script>
|
||||
</body>
|
||||
|
@ -58,12 +58,9 @@ class Popup {
|
||||
}
|
||||
|
||||
setContent(content) {
|
||||
if (this.popup === null) {
|
||||
return;
|
||||
if (this.popup !== null) {
|
||||
this.popup.srcdoc = content;
|
||||
}
|
||||
|
||||
const doc = this.popup;
|
||||
doc.srcdoc=content;
|
||||
}
|
||||
|
||||
sendMessage(action, params, callback) {
|
||||
|
@ -16,19 +16,6 @@
|
||||
* 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 {
|
||||
constructor(range) {
|
||||
|
@ -28,10 +28,5 @@
|
||||
"fg/js/frame.js",
|
||||
"fg/ttf/kanji-stroke-orders.ttf",
|
||||
"fg/ttf/vl-gothic-regular.ttf"
|
||||
],
|
||||
"applications": {
|
||||
"gecko": {
|
||||
"id": "yomichan-gecko@example.com"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user