From 5057d6b6cff3bb9a176f3d96e64c878843dd443e Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sat, 15 Oct 2016 19:51:41 -0700 Subject: [PATCH] WIP --- ext/bg/background.html | 1 - ext/bg/js/ankiweb.js | 47 +++++++++++++++++++++++------------------- ext/bg/js/util.js | 2 +- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/ext/bg/background.html b/ext/bg/background.html index 65707416..a849fadb 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -2,7 +2,6 @@ - diff --git a/ext/bg/js/ankiweb.js b/ext/bg/js/ankiweb.js index 6cfc50be..9abd9b86 100644 --- a/ext/bg/js/ankiweb.js +++ b/ext/bg/js/ankiweb.js @@ -75,12 +75,9 @@ class AnkiWeb { static scrape() { return new Promise((resolve, reject) => { - $.get('https://ankiweb.net/edit/', (data, status) => { - if (status !== 'success') { - reject('failed to execute scrape request'); - return; - } - + const xhr = new XMLHttpRequest(); + xhr.addEventListener('error', () => reject('failed to execute scrape request')); + xhr.addEventListener('load', () => { const modelsJson = JSON.parse(/editor\.models = (.*}]);/.exec(data)[1]); if (!modelsJson) { reject('failed to scrape model data'); @@ -105,34 +102,42 @@ class AnkiWeb { resolve({deckNames, models}); }); + + xhr.open('GET', 'https://ankiweb.net/edit/'); + xhr.send(); }); } static login(username, password) { return new Promise((resolve, reject) => { - $.post('https://ankiweb.net/account/login', {username, password, submitted: 1}, (data, status) => { - if (status === 'success') { - if (data.includes('class="mitem"')) { - resolve(); - } else { - reject('failed to authenticate'); - } + const xhr = new XMLHttpRequest(); + xhr.addEventListener('error', () => reject('failed to execute login request')); + xhr.addEventListener('success', () => { + if (xhr.responseText.includes('class="mitem"')) { + resolve(); } else { - reject('failed to execute login request'); + reject('failed to authenticate'); } }); + + const form = new FormData(); + form.append('username', username); + form.append('password', password); + form.append('submitted', 1); + + xhr.open('POST', 'https://ankiweb.net/account/login'); + xhr.send(form); }); } static logout() { return new Promise((resolve, reject) => { - $.get('https://ankiweb.net/account/logout', (data, status) => { - if (status === 'success') { - resolve(); - } else { - reject('failed to execute logout request'); - } - }); + const xhr = new XMLHttpRequest(); + xhr.addEventListener('error', () => reject('failed to execute logout request')); + xhr.addEventListener('load', () => resolve()); + + xhr.open('GET', 'https://ankiweb.net/account/logout'); + xhr.send(); }); } } diff --git a/ext/bg/js/util.js b/ext/bg/js/util.js index 95d1b43e..1e033eef 100644 --- a/ext/bg/js/util.js +++ b/ext/bg/js/util.js @@ -34,7 +34,7 @@ function loadJson(url) { return new Promise((resolve, reject) => { const xhr = new XMLHttpRequest(); xhr.addEventListener('load', () => resolve(JSON.parse(xhr.responseText))); - xhr.open('GET', chrome.extension.getURL(url), true); + xhr.open('GET', chrome.extension.getURL(url)); xhr.send(); }); }