Commit Graph
1072 Commits
Author SHA1 Message Date
Paul Kaplan 4927e12e80 Share the replace project confirmation string between new and upload 2019-02-13 09:29:05 -05:00
Paul Kaplan 24ca96971e Merge branch 'develop' into prompt-before-upload-replace 2019-02-12 09:21:53 -05:00
Paul Kaplan cae9d9a683 Merge branch 'develop' into nj/ui-changes 2019-02-12 09:04:31 -05:00
Paul Kaplan 361a9d7393 Make sure to put history in try/catch so it can be used with selenium
Selenium loads the playground using the file:// protocol, where history.replaceState throws an error
2019-02-11 14:40:41 -05:00
Paul Kaplan 29e738cb92 Prompt user about file upload replacing the current project
This only shows when you are on a project that is SHOWING_WITHOUT_ID and has changes. This is only the case when logged out, or in the desktop editor.
2019-02-11 14:03:00 -05:00
Nikhil Jha fb9c3eed74 Merge branch 'develop' into nj/ui-changes 2019-02-08 20:21:32 -08:00
Paul Kaplan b618f2493c Fix backdrop uploading from gif 2019-02-08 13:56:00 -05:00
Paul Kaplan a18ea5a92c Name uploaded backdrops based on the name 2019-02-08 13:44:10 -05:00
Paul Kaplan 28635d8028 Remove namer from costume and sound upload helpers to reduce spaghetti 2019-02-08 13:18:57 -05:00
Paul Kaplan ba277a5238 Fix namer conventions to be less bizarre 2019-02-08 13:18:57 -05:00
Paul Kaplan 489467e63d Pass function for naming costumes, add integration tests 2019-02-08 13:18:57 -05:00
Paul Kaplan 88651e6e48 Gif upload v1: sprites, costumes 2019-02-08 13:18:57 -05:00
Paul Kaplan da65b41366 Merge pull request #4499 from LLK/multi-upload
Multiple file upload for costumes, sounds, backdrops and sprites
2019-02-08 10:47:15 -05:00
Paul Kaplan 50b14524b2 Get the asset type correctly 2019-02-07 11:56:03 -05:00
Paul Kaplan 0c261e5597 Use blob download instead of data-uri to enable large downloads
This was already being used for sb3s and sprite3s, but the code was repeated in different places. Make a single helper that downloads blobs, and make all download paths use it.
2019-02-07 11:44:34 -05:00
Nikhil Jha 781c682e60 Merge branch 'develop' into nj/ui-changes 2019-02-06 14:56:46 -08:00
Paul Kaplan 8a46b8f71b Make file uploader call callback for each uploaded file 2019-02-06 12:09:32 -05:00
Paul Kaplan 1f2f41b597 Merge pull request #4493 from paulkaplan/fix-see-inside-toolbox
Fix "See Inside" not showing variables
2019-02-06 10:37:22 -05:00
Paul Kaplan ebbf292ffd Fix toolbox updating after see-inside.
We can't rely on refreshWorkspace always causing a toolbox update, so make sure to update the toolbox manually if it is needed.
2019-02-05 16:35:30 -05:00
Paul Kaplan fe0c5d53d4 Merge pull request #4467 from paulkaplan/fix-backpack-code-updating
Call updateToolbox after adding new blocks from the backpack.
2019-02-05 12:07:18 -05:00
Paul Kaplan 361187dcaa Merge pull request #4481 from paulkaplan/hotfix/toolbox-language
[develop] hotfix toolbox language
2019-02-04 11:35:21 -05:00
Paul Kaplan f270b36f64 Initialize locale on ScratchBlocks before initial workspace injection
This fixes a problem where having a non-default locale set during the initial load would display the blocks in the default toolbox in the wrong language, because the toolbox recycling toggle in setLocale does not work on initial load because there is no editing target to refresh.
2019-02-04 09:46:58 -05:00
Nikhil Jha 9232b1c656 Merge branch 'develop' into nj/ui-changes 2019-02-01 15:19:38 -08:00
Paul Kaplan ae96163a41 Export costumes without inlined fonts for now.
Since the common use-case is download/edit/re-upload, and we do not want to explode the storage size of assets (which are considerably larger with fonts inlined), just do what scratch2 did and do not inline the fonts. This is not ideal if kids want to use the costumes for other purposes, but until we can create a way to strip inlined fonts before uploading to the asset server, this is the conservative way to go.
2019-02-01 14:27:02 -05:00
Paul Kaplan 55461a07a7 Merge pull request #4438 from apple502j/download-assets
Export costumes and sounds!
2019-02-01 14:04:47 -05:00
Paul Kaplan f41c5764ff Use more generic download-url and remove older download-text utility 2019-02-01 13:17:43 -05:00
Paul Kaplan 327eb91fc0 Call updateToolbox after adding new blocks from the backpack.
This fixes the issue where you could not see any new variables or custom block callers, as well as fixing the issue where the toolbox did not update from then on.
2019-01-31 16:42:56 -05:00
Paul Kaplan 9264f30198 Make the toolbox xml reflect the costume, sound and backdrop name
This invalidates the toolbox XML when switching back to the code tab after e.g. renaming a costume, making the code tab
2019-01-30 09:39:18 -05:00
Paul Kaplan 0d32ac5b40 Only update the toolbox when the blocks tab is visible.
Need to store the rendered xml because the props can change while the blocks tab is hidden, but we re-render based on what was rendered, not the previous props (which may not have been rendered).

This is similar to the `ThrottledPropertyHOC` in that there may be prop changes that do not get rendered, but in this case for a different reason.

This increases the performance of switching between code and other editor tabs, as well as improving the "See Inside" performance. It makes switching to the code tab as fast as switching between sprites.
2019-01-29 14:05:38 -05:00
Paul Kaplan 5632eb1bdb Merge pull request #4440 from paulkaplan/improve-block-perf
Avoid double toolbox update on mount and when setting language
2019-01-29 14:05:04 -05:00
Nikhil Jha aaa8fd20e4 Fix Lint 2019-01-28 17:07:43 -08:00
Nikhil Jha 9da0937ebb Remove References 2019-01-28 16:52:46 -08:00
Paul Kaplan c017d2d490 Remove cruft 2019-01-28 15:32:38 -05:00
Paul Kaplan d08ce5d937 Move rounding into sprite info to avoid generating lots of garbage
It also avoids repeating the costly object spread, which becomes a problem for projects with a lot of sprites
2019-01-28 12:02:03 -05:00
Benjamin Wheeler d7549bec1f Merge pull request #4099 from benjiwheeler/sprite-animate-render
Sprite library animations no longer update the entire library state on every costume change
2019-01-28 10:12:36 -05:00
Paul Kaplan cf0d5487d6 Avoid double toolbox update when setting the locale 2019-01-28 09:15:19 -05:00
apple502j 2a36f49d7c Export costumes and sounds 2019-01-27 19:21:15 +09:00
Nikhil Jha 8459c67cee Actually fully remove preview modal. 2019-01-23 14:19:50 -08:00
Paul Kaplan d9c5ad6aa4 Use curried style for HOC configuration 2019-01-23 15:56:23 -05:00
Paul Kaplan eccbfe71a5 Throttle updates to stage images also 2019-01-23 14:49:35 -05:00
Paul Kaplan cc7a087e80 Throttle the watermark updates using the same HOC 2019-01-23 14:37:57 -05:00
Paul Kaplan 0910b2ece1 Remove dead code 2019-01-23 13:58:52 -05:00
Paul Kaplan 6713c7ad0f Fix issue where dragPayload was being invalidated for sprites
Use PureComponent instead since it is a simple shouldComponentUpdate check now.
2019-01-23 13:58:42 -05:00
Nikhil Jha 28fbb5352c Fully delete preview modal. 2019-01-22 14:27:16 -08:00
Eric Rosenbaum ff473e8fb0 Merge pull request #3922 from evhan55/extensions/disconnect-errors
Peripheral disconnect status using new runtime/vm event
2019-01-18 16:59:22 -05:00
Paul Kaplan 5e2055fc84 Revert "Merge pull request #4354 from paulkaplan/fix-backpack-sprite"
This reverts commit 97f8eb63b4, reversing
changes made to 2e017f060f.
2019-01-18 15:09:12 -05:00
Evelyn Eastmond c1ad2b51b6 Changes to event names to clarify them. 2019-01-16 20:48:49 -05:00
Evelyn Eastmond d72d2c5de2 Adding a new runtime event for peripheral disconnects that are intentional. 2019-01-16 20:48:49 -05:00
Karishma Chadha 97f8eb63b4 Merge pull request #4354 from paulkaplan/fix-backpack-sprite
Fix issue where you couldn't add sprites from backpack when there are no sprites
2019-01-16 15:39:13 -05:00
Paul Kaplan a2cc320d1f Clear trim handles if trim cannot be completed.
There was a useability issue discovered in testing where trying to trim a sound to be of zero length would fail, but just leave the trimmers active. Clear them out, since the trim is invalid
2019-01-15 15:25:26 -05:00