Uh oh!
There was an error while loading. Please reload this page.
Fix #492 - Add image filters (#694) - #756
Merged
gideonthomas merged 1 commit intoMay 10, 2017
Merged
Conversation
updated code to load hidden image and use that url to load our canvas; indentation fixes, added basic error handling for callback of line 24 attempt to take the code from filters.js and put it into ImageViewer.js fixes the swatches not loading and allows canvas to be shown for multiple images, but save problem persists First fixes Abstract base64 to buffer conversion logic Cleanup image filter code Update main.js "added a comma to fix build error" got rid of extra lines that weren't working with current build reverted change to dimensionString fixed a capitalization typo for Image.js require updated caman library with comment block for details of license, url, etc updated base64toBuffer to be in fileUtils fixed a variable name typo [FileUtils] to [FilerUtils] updated to make text fixes (IMAGE_FILTER to IMAGE_FILTERS_TITLE and alignment), and removed the filesystemRefresh function (seems stable from my testing) Some styling updates to the image filter UI. Added a progress spinner De-selecting selected filter after it's applied to the image. Hard to force a style override and fixed a nit. Code style fixes
gideonthomasforce-pushed
the
instagram-with-styling2
branch
from
May 10, 2017 04:50
19b22f5 to
a78c247Comparegideonthomas
commented
May 10, 2017
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moved over from #694 and contains @timmoy's work.