Skip to content

Fix #775 #776

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2019
Merged

Fix #775 #776

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f04642
Fix #775
dplewis Apr 1, 2019
41cf3b3
Merge branch 'master' into fix-775
dplewis Apr 2, 2019
34db6b8
clean up
dplewis Apr 2, 2019
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
36 changes: 18 additions & 18 deletions src/ParseFile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,26 +316,26 @@ const DefaultController = {
download: function(uri) {
if (XHR) {
return this.downloadAjax(uri);
}
if (process.env.PARSE_BUILD === 'browser') {
} else if (process.env.PARSE_BUILD === 'node') {
return new Promise((resolve, reject) => {
const client = uri.indexOf('https') === 0
? require('https')
: require('http');
client.get(uri, (resp) => {
resp.setEncoding('base64');
let base64 = '';
resp.on('data', (data) => base64 += data);
resp.on('end', () => {
resolve({
base64,
contentType: resp.headers['content-type'],
});
});
}).on('error', reject);
});
} else {
return Promise.reject('Cannot make a request: No definition of XMLHttpRequest was found.');
}
return new Promise((resolve, reject) => {
const client = uri.indexOf('https') === 0
? require('https')
: require('http');
client.get(uri, (resp) => {
resp.setEncoding('base64');
let base64 = '';
resp.on('data', (data) => base64 += data);
resp.on('end', () => {
resolve({
base64,
contentType: resp.headers['content-type'],
});
});
}).on('error', reject);
});
},

downloadAjax: function(uri) {
Expand Down