Use asynchronous requests for Instagram
This commit is contained in:
parent
8c3a4c3f15
commit
c51209e2c3
|
@ -31,7 +31,7 @@ function copyToClipboard(url) {
|
|||
|
||||
chrome.pageAction.onClicked.addListener(function(tab) {
|
||||
getCurrentTabUrl(function(url) {
|
||||
var betterUrl = getBetterUrl(url);
|
||||
getBetterUrl(url, function(betterUrl) {
|
||||
var filename = betterUrl.substr(betterUrl.lastIndexOf("/"));
|
||||
filename = cleanExtension(filename);
|
||||
|
||||
|
@ -81,9 +81,10 @@ chrome.pageAction.onClicked.addListener(function(tab) {
|
|||
worker.postMessage(JSON.stringify({pomfclone: config.url, url: betterUrl, filename: filename}));
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
function getBetterUrl(url) {
|
||||
function getBetterUrl(url, callback) {
|
||||
var extensionIndex = url.lastIndexOf('.');
|
||||
var extension = url.substr(extensionIndex + 1);
|
||||
|
||||
|
@ -99,12 +100,10 @@ function getBetterUrl(url) {
|
|||
url = url + ':orig';
|
||||
}
|
||||
|
||||
|
||||
if(isInstagramUrl(url)) {
|
||||
var request = new XMLHttpRequest();
|
||||
request.open('GET', 'https://api.instagram.com/oembed/?callback=&url=' + url, false); //TODO: Make this asynchronous somehow
|
||||
request.send(null);
|
||||
|
||||
request.open('GET', 'https://api.instagram.com/oembed/?callback=&url=' + url, true);
|
||||
request.onload = function () {
|
||||
var json = JSON.parse(request.responseText);
|
||||
|
||||
var filename = json.thumbnail_url.substr(json.thumbnail_url.lastIndexOf('/') + 1);
|
||||
|
@ -112,10 +111,12 @@ function getBetterUrl(url) {
|
|||
|
||||
var baseurl = 'https://scontent-amt2-1.cdninstagram.com/';
|
||||
|
||||
return baseurl + '/' + filename;
|
||||
callback(baseurl + '/' + filename);
|
||||
};
|
||||
request.send();
|
||||
} else {
|
||||
callback(url);
|
||||
}
|
||||
|
||||
return url;
|
||||
}
|
||||
|
||||
function cleanExtension(url) {
|
||||
|
@ -154,9 +155,10 @@ chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
|
|||
|
||||
chrome.tabs.onActivated.addListener(function(activeInfo) {
|
||||
chrome.tabs.get(activeInfo.tabId, function(tab) {
|
||||
if(isCoolUrl(getBetterUrl(tab.url)))
|
||||
{
|
||||
getBetterUrl(tab.url, function(betterUrl) {
|
||||
if(isCoolUrl(betterUrl)) {
|
||||
chrome.pageAction.show(activeInfo.tabId);
|
||||
}
|
||||
})
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in New Issue