summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2016-07-06 19:56:13 -0700
committerAlex Yatskov <alex@foosoft.net>2016-07-06 19:56:13 -0700
commitabb3d741422ac456546dc7d2995f0915998fde4e (patch)
treecd892d1db0354df728bafab6c49ae3cbc50d8bc4
parent80d2eac33cf00a8b13afb84d9d242029db97c75b (diff)
Temporarily removing gecko code from master until everything works in
firefox branch. This reverts commit 30585892b812dbf19c15bd010d6032fffa204c0d, reversing changes made to bd89db4ec5a55e7b08b27a3d736a32e859084aff.
-rw-r--r--ext/bg/background.html1
-rw-r--r--ext/bg/js/polyfill-gecko.js15
-rw-r--r--ext/bg/js/translator.js10
-rw-r--r--ext/bg/options.html1
-rw-r--r--ext/fg/js/popup.js7
-rw-r--r--ext/fg/js/range.js13
-rw-r--r--ext/manifest.json7
7 files changed, 3 insertions, 51 deletions
diff --git a/ext/bg/background.html b/ext/bg/background.html
index c6a84636..c35e917d 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -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>
diff --git a/ext/bg/js/polyfill-gecko.js b/ext/bg/js/polyfill-gecko.js
deleted file mode 100644
index 8c7cc403..00000000
--- a/ext/bg/js/polyfill-gecko.js
+++ /dev/null
@@ -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(){}
- };
-} \ No newline at end of file
diff --git a/ext/bg/js/translator.js b/ext/bg/js/translator.js
index d79ec6d1..bf1538e2 100644
--- a/ext/bg/js/translator.js
+++ b/ext/bg/js/translator.js
@@ -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();
diff --git a/ext/bg/options.html b/ext/bg/options.html
index a2b4a56b..289a0f60 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -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>
diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js
index 4c2b18f7..4ec34249 100644
--- a/ext/fg/js/popup.js
+++ b/ext/fg/js/popup.js
@@ -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) {
diff --git a/ext/fg/js/range.js b/ext/fg/js/range.js
index 0befe279..182e242c 100644
--- a/ext/fg/js/range.js
+++ b/ext/fg/js/range.js
@@ -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) {
diff --git a/ext/manifest.json b/ext/manifest.json
index 70ce4a9a..5f011d0d 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -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"
- }
- }
+ ]
}