Skip to content

Quick refactor #7

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 4 commits into from
Aug 19, 2019
Merged

Quick refactor #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
51ead2d
refactor a couple things for less code complexity
dholms Aug 19, 2019
aeb55f3
fixed syntax error
dholms Aug 19, 2019
9d2d9ea
remove unused else
dholms Aug 19, 2019
fb86205
Merge branch 'master' into quick-refactor
dholms Aug 19, 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
27 changes: 13 additions & 14 deletions src/ipfs/getIpfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const loadWindowIpfs = async permissions => {
ipfs = await window.ipfs.enable({
commands: permissions
});
} else {
}
const isWorking = await ipfsIsWorking(ipfs);
if (isWorking) {
Expand Down Expand Up @@ -58,21 +57,21 @@ export const loadJsIpfs = async () => {
});
};

const getIpfs = (permissions = DEFAULT_PERMISSIONS) => {
// if already instantiated
if (ipfsInstance) {
return ipfsInstance;
}
const getIpfs = async (permissions = DEFAULT_PERMISSIONS) => {
// if already instantiated
if (ipfsInstance) {
return ipfsInstance;
}

ipfsInstance = await loadWindowIpfs(permissions)
if(ipfsInstance){
console.log("window.ipfs is available!")
return ipfsInstance
}
ipfsInstance = await loadWindowIpfs(permissions);
if (ipfsInstance) {
console.log("window.ipfs is available!");
return ipfsInstance;
}

console.log("window.ipfs is not available, downloading from CDN...");
ipfsInstance = await loadJsIpfs();
return ipfsInstance
console.log("window.ipfs is not available, downloading from CDN...");
ipfsInstance = await loadJsIpfs();
return ipfsInstance;
};

export default getIpfs;