summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-01-28 20:36:58 -0800
committerAlex Yatskov <alex@foosoft.net>2017-01-28 20:36:58 -0800
commit2a29429104618c25a752a2f3b61527cec9921447 (patch)
tree8a277105ead916dfe7ed71fdf449ffa468d9b217 /ext
parent944be5fa64c935940a33a3d2494833bfb17f3358 (diff)
WIP
Diffstat (limited to 'ext')
-rw-r--r--ext/bg/js/util.js1
-rw-r--r--ext/fg/js/driver.js6
-rw-r--r--ext/manifest.json1
3 files changed, 5 insertions, 3 deletions
diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js
index 0b649ef6..24050cf3 100644
--- a/ext/bg/js/util.js
+++ b/ext/bg/js/util.js
@@ -240,6 +240,7 @@ function formatField(field, definition, mode, options) {
function loadJson(url) {
return new Promise((resolve, reject) => {
const xhr = new XMLHttpRequest();
+ xhr.overrideMimeType('application/json');
xhr.addEventListener('load', () => resolve(xhr.responseText));
xhr.addEventListener('error', () => reject('failed to execute network request'));
xhr.open('GET', url);
diff --git a/ext/fg/js/driver.js b/ext/fg/js/driver.js
index 5467a9f0..2e818acf 100644
--- a/ext/fg/js/driver.js
+++ b/ext/fg/js/driver.js
@@ -67,9 +67,9 @@ class Driver {
return;
}
- if (e.which === 1 /* lmb */) {
- return;
- }
+ // if (e.which === 1 /* lmb */) {
+ // return;
+ // }
if (this.options.scanning.requireShift && !e.shiftKey) {
return;
diff --git a/ext/manifest.json b/ext/manifest.json
index 2ac61690..0fd72386 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -12,6 +12,7 @@
"content_scripts": [{
"matches": ["*://*/*", "file://*/*"],
"js": [
+ "fg/js/gecko.js",
"fg/js/source-range.js",
"fg/js/source-element.js",
"fg/js/popup.js",