This repository has been archived by the owner on Jan 17, 2023. It is now read-only.
Generate, upload, and display thumbnail of shots. #3712
Merged
Conversation
This file contains 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
chenba
changed the title
chenba
force-pushed
the
3282-thumbnails
branch
from
eaa7abb to
39b6a90
Compare
chenba
changed the title
ianb
approved these changes
Nov 27, 2017
| @@ -33,8 +34,9 @@ this.takeshot = (function() { | |||
| } | |||
| let convertBlobPromise = Promise.resolve(); | |||
| if (buildSettings.uploadBinary && !imageBlob) { | |||
| imageBlob = blobConverters.dataUrlToBlob(shot.getClip(shot.clipNames()[0]).image.url); | |||
| shot.getClip(shot.clipNames()[0]).image.url = ""; | |||
| let clipImage = shot.getClip(shot.clipNames()[0]).image | |||
| let headers; | ||
| // @TODO: add thumbnail to payload |
server/src/pages/shot/controller.js
Outdated
| }); | ||
| return fetch(req).then((resp) => { | ||
| if (!resp.ok) { | ||
| var errorMessage = "Error saving edited shot"; |
server/src/server.js
Outdated
| app.put("/data/:id/:domain", upload.single('blob'), function(req, res) { | ||
| app.put("/data/:id/:domain", | ||
| upload.fields([{name: "blob", maxCount: 1}, {name: "thumbnail", maxCount: 1}]), | ||
| function(req, res) { |
There was a problem hiding this comment.
I guess the indentation below should be changed
| `).split(/\s+/g); | ||
|
|
||
| // Attributes that will be accepted in the constructor, but ignored/dropped | ||
| AbstractShot.prototype.DEPRECATED_ATTRS = (` | ||
| microdata history ogTitle createdDevice head body htmlAttrs bodyAttrs headAttrs | ||
| readable hashtags comments showPage isPublic resources deviceId url | ||
| fullScreenThumbnail |
There was a problem hiding this comment.
I didn't realize we had never deprecated fullScreenThumbnail (which was from when we were doing more expansive data capturing). Anyway, good to have it gone.
chenba
force-pushed
the
3282-thumbnails
branch
from
39b6a90 to
c0496ab
Compare
|
Yep, that TODO was a leftover I missed. Squashed and merged. |
# for free
to subscribe to this conversation on GitHub.
Already have an account?
#.
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.
imagestable and allows the thumbnails to be managed identically to the shot images.Fix #3282