Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to async xhr #839

Merged
merged 5 commits into from
Jul 27, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions app/adapters/web-extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,10 @@ export default BasicAdapter.extend({
},

_injectDebugger() {
chrome.devtools.inspectedWindow.eval(loadEmberDebug());
this.onResourceAdded();
loadEmberDebug().then((emberDebug) => {
chrome.devtools.inspectedWindow.eval(emberDebug);
this.onResourceAdded();
});
},

_setThemeColors() {
Expand All @@ -68,7 +70,7 @@ export default BasicAdapter.extend({
document.body.classList.add(theme);
},

onResourceAdded(/*callback*/) {},
onResourceAdded(/*callback*/) { },

willReload() {
this._injectDebugger();
Expand Down Expand Up @@ -99,28 +101,42 @@ export default BasicAdapter.extend({
scripts as soon as possible into the new page.
*/
reloadTab() {
chrome.devtools.inspectedWindow.reload({
injectedScript: loadEmberDebug()
loadEmberDebug().then((emberDebug) => {
chrome.devtools.inspectedWindow.reload({ injectedScript: emberDebug });
});

},

canOpenResource: false,

sendIframes(urls) {
urls.forEach(url => {
chrome.devtools.inspectedWindow.eval(loadEmberDebug(), { frameURL: url });
loadEmberDebug().then((emberDebug) => {
urls.forEach(url => {
chrome.devtools.inspectedWindow.eval(emberDebug, { frameURL: url });
});
});
}
});

function loadEmberDebug() {
let minimumVersion = config.emberVersionsSupported[0].replace(/\./g, '-');
let xhr;
if (!emberDebug) {
xhr = new XMLHttpRequest();
xhr.open("GET", chrome.runtime.getURL(`/panes-${minimumVersion}/ember_debug.js`), false);
xhr.send();
emberDebug = xhr.responseText;
}
return emberDebug;
return new Promise((resolve) => {
if (!emberDebug) {
xhr = new XMLHttpRequest();
xhr.open("GET", chrome.runtime.getURL(`/panes-${minimumVersion}/ember_debug.js`));
xhr.onload = function() {
if (xhr.readyState === 4) {
if (xhr.status === 200) {
emberDebug = xhr.responseText;
resolve(emberDebug);
}
}
};

xhr.send();
} else {
resolve(emberDebug);
}
});
}