Skip to content

Fix two issues encountered in Edge browser (#507) #508

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

Open
dannya wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −5
Open

Fix two issues encountered in Edge browser (#507) #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2401d02
* Use `!isFile()` instead of `!(state.file instanceof Blob)` when det…
dannya May 26, 2020
9c6a1e9
* Remove console.log (which looks like it was left in accidentally, s…
dannya May 26, 2020
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
2 changes: 0 additions & 2 deletions src/js/app/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,6 @@ export const actions = (dispatch, query, state) => ({
success(createItemAPI(item));
}

console.log('REMOVE_ITEM', options);

// if this is a local file and the server.remove function has been configured, send source there so dev can remove file from server
const server = state.options.server;
if (item.origin === FileOrigin.LOCAL && server && isFunction(server.remove)) {
Expand Down
2 changes: 1 addition & 1 deletion src/js/app/utils/createFileProcessorFunction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const createFileProcessorFunction = (apiUrl, action, name, options) => (f
if (isObject(metadata)) { formData.append(name, JSON.stringify(metadata)); }

// Turn into an array of objects so no matter what the input, we can handle it the same way
(file instanceof Blob ? [{ name: null, file }] : file).forEach(item => {
[{ name: null, file }].forEach(item => {
formData.append(name, item.file, item.name === null ? item.file.name : `${item.name}${item.file.name}`);
});

Expand Down
4 changes: 2 additions & 2 deletions src/js/app/utils/createItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const createItem = (origin = null, serverFileReference = null, file = nul
fire('load-init');
});

// we'eve received a size indication, let's update the stub
// we've received a size indication, let's update the stub
loader.on('meta', meta => {

// set size of file stub
Expand Down Expand Up @@ -226,7 +226,7 @@ export const createItem = (origin = null, serverFileReference = null, file = nul
abortProcessingRequestComplete = null;

// if no file loaded we'll wait for the load event
if (!(state.file instanceof Blob)) {
if (!isFile(state.file)) {
api.on('load', () => {
process(processor, onprocess);
});
Expand Down