summaryrefslogtreecommitdiff
path: root/qutebrowser/javascript
diff options
context:
space:
mode:
authorJay Kamat <jaygkamat@gmail.com>2018-12-29 08:02:11 -0800
committerJay Kamat <jaygkamat@gmail.com>2018-12-29 08:02:11 -0800
commit57ef3b9b5b887a2820616aebab1efa7884cadd83 (patch)
treebbfb05af3918468a38e397a7ff226881c34944ce /qutebrowser/javascript
parented84aa8c7b705bf2d3ac715748c644f1642ce585 (diff)
parent4b0d1b394eff12e89c34548af12e3071d4edbb88 (diff)
downloadqutebrowser-57ef3b9b5b887a2820616aebab1efa7884cadd83.tar.gz
qutebrowser-57ef3b9b5b887a2820616aebab1efa7884cadd83.zip
Merge branch 'master' into stylesheet-fix
Diffstat (limited to 'qutebrowser/javascript')
-rw-r--r--qutebrowser/javascript/caret.js2
-rw-r--r--qutebrowser/javascript/greasemonkey_wrapper.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/javascript/caret.js b/qutebrowser/javascript/caret.js
index 28ab3fab0..5e6640311 100644
--- a/qutebrowser/javascript/caret.js
+++ b/qutebrowser/javascript/caret.js
@@ -1,5 +1,5 @@
/* eslint-disable max-len, max-statements, complexity,
-default-case, valid-jsdoc */
+default-case */
// Copyright 2014 The Chromium Authors. All rights reserved.
//
diff --git a/qutebrowser/javascript/greasemonkey_wrapper.js b/qutebrowser/javascript/greasemonkey_wrapper.js
index 457118696..f8c36151a 100644
--- a/qutebrowser/javascript/greasemonkey_wrapper.js
+++ b/qutebrowser/javascript/greasemonkey_wrapper.js
@@ -60,7 +60,7 @@
details.method = details.method ? details.method.toUpperCase() : "GET";
if (!details.url) {
- throw new Error("GM_xmlhttpRequest requires an URL.");
+ throw new Error("GM_xmlhttpRequest requires a URL.");
}
// build XMLHttpRequest object