Commit Graph
1144 Commits
Author SHA1 Message Date
Christopher Willis-Ford c9d1535967 move defineDynamicBlock into its own file 2019-06-03 13:04:15 -07:00
Christopher Willis-Ford 38455a7108 enable monitors for dynamic extension blocks 2019-05-28 11:45:57 -07:00
Karishma Chadha ebe310bc65 Add support for arguments on dynamic extension blocks. 2019-05-28 11:45:57 -07:00
Christopher Willis-Ford 5bc3198263 remove unused require 2019-05-28 11:45:57 -07:00
Christopher Willis-Ford 5d6669db6d add "scratch_extension" only if a block has an icon 2019-05-28 11:45:57 -07:00
Christopher Willis-Ford 717c773800 add block type check in defineDynamicBlock 2019-05-28 11:45:57 -07:00
Christopher Willis-Ford 935a4520da WIP dynamic block support 2019-05-28 11:45:56 -07:00
Christopher Willis-Ford 7685dad40a update extension event handling for categoryInfo 2019-05-28 11:45:56 -07:00
Paul Kaplan d342b82219 Merge pull request #4800 from mzgoddard/delay-gui
Delay loading and rendering gui
2019-05-23 14:14:37 -04:00
Paul Kaplan 227581ebcf Merge pull request #4677 from mzgoddard/update-toolbox
render only new toolbox xmls
2019-05-23 14:14:09 -04:00
Eric Rosenbaum a11fcfe373 Fix typo in variable name 2019-05-09 15:12:13 -04:00
Eric Rosenbaum 52a3600819 Surprise sprites do not include letters and numbers 2019-05-09 15:06:26 -04:00
Michael "Z" Goddard bec6223e6e delay loading and rendering gui
- Create the scratch renderer earlier in the GUI container/HOC stack
- Delay loading and rendering GUI component until after project assets
  have been fetched
2019-05-08 16:58:07 -04:00
Evelyn Eastmond 4ec8ac16a8 Reword 'toggle' to 'shrinkExpand' throughout code. 2019-05-07 11:42:40 -04:00
Evelyn Eastmond 170705440a Adding toggle state to Cards. Using toggle state to set the CSS state. 2019-05-07 11:42:40 -04:00
Evelyn Eastmond a52fdaa032 Completing propagation of toddleCards. 2019-05-07 11:42:40 -04:00
Paul Kaplan ffeebb03bd Update eslint-plugin-react and fix new lint errors.
This includes a small bug where the target pane wouldn't automatically update if changes to the sprite occured while in fullscreen/player mode.

Closes #4221
2019-05-01 11:01:44 -04:00
Ben Wheeler 516baedad9 added tests, rewrote menu-bar-hoc to accomodate tests 2019-05-01 07:02:07 -04:00
Michael "Z" Goddard d83ec5a0b5 replace blocks timeout with a promise
The timeout as a promise lets us update the toolbox during the same
render as the workspace so that the screen updates all together. This
also means the toolbox will update before the loading screen is
dismissed after loading, letting us avoid a second flash for the
toolbox to update.
2019-04-30 16:36:52 -04:00
Ben Wheeler 16024769c8 renamed confirm-replace-hoc to menu-bar-hoc; moved project changed checking there 2019-04-30 15:02:22 -04:00
Ben Wheeler dfb7b55145 removed confirm prompt if you are editing someone else's project and then do file -> upload 2019-04-18 11:34:11 -04:00
Karishma Chadha 3033717d67 Merge pull request #4748 from LLK/hotfix/assetIdNull
Hotfix/asset id null
2019-04-17 16:17:40 -04:00
Benjamin Wheeler f8243eae9e Merge pull request #4700 from benjiwheeler/upload-in-place
upload in current project id, rather than creating new project id
2019-04-17 14:54:51 -04:00
Ben Wheeler c064eaed4e upload in current project id, rather than creating new project id 2019-04-16 23:34:07 -04:00
Karishma Chadha cb928b8490 Merge pull request #4733 from paulkaplan/presave-backpack-asset
Make sure to save assets before sending them to the backpack
2019-04-16 11:05:03 -04:00
Karishma Chadha 308568a332 Fix bugs found while testing related to retrieving and storing asset. 2019-04-12 12:10:49 -04:00
Paul Kaplan 0fbbf55b51 Revert "Load library images through storage" 2019-04-11 11:13:34 -04:00
Paul Kaplan 17e28b2a24 Make sure to save assets before sending them to the backpack
This prevents assets from existing in the backpack server without also existing in the asset server.
2019-04-11 08:29:46 -04:00
Chris Willis-Ford 8a1b104f28 Merge pull request #4644 from cwillisf/load-library-images-through-storage
Load library images through storage
2019-04-10 11:35:46 -07:00
Paul Kaplan 00f07c3801 Merge pull request #4690 from ericrosenbaum/bugfix/load-ext-without-library-assets
Prevent crash on load hardware ext without assets
2019-04-10 09:06:53 -04:00
Karishma Chadha e82e370e83 Register callback keys for buttons used in future extensions. 2019-04-03 11:10:10 -04:00
Ben Wheeler 2b5196106a remove code in sb-file-uploader that sets uri history on loading project from file 2019-04-01 14:08:11 -04:00
Michael "Z" Goddard 866af2f766 render toolboxes once the workspace has rendered 2019-03-26 17:33:42 -04:00
Eric Rosenbaum 4fab686aea Prevent crash on load hardware ext without assets 2019-03-26 15:59:03 -04:00
Michael "Z" Goddard 656e8c2c77 render only new toolbox xmls 2019-03-21 14:57:22 -04:00
Evelyn Eastmond a4cb3b1eb5 Changing React property name for connection tip icon throughout. 2019-03-18 15:04:12 -04:00
Evelyn Eastmond 8e3bd8c631 Changing prop names throughout React chain to reflect new extension library property names. 2019-03-18 14:58:32 -04:00
Chris Willis-Ford f773ee2dab Merge branch 'develop' into load-library-images-through-storage 2019-03-13 16:33:38 -07:00
Paul Kaplan 1dd3e1d26a Merge pull request #4638 from paulkaplan/remove-analytics
Remove most of the GA events
2019-03-13 17:03:21 -04:00
Christopher Willis-Ford d8201fd4ad Merge branch 'develop' into scratch-desktop
Conflicts:
	src/components/library-item/library-item.jsx
	src/components/library/library.jsx
	src/components/menu-bar/menu-bar.jsx
	src/containers/library-item.jsx
	src/lib/project-saver-hoc.jsx
2019-03-12 15:01:42 -07:00
Christopher Willis-Ford 849fe8fc0c Merge branch 'develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford 73e1bc352b Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -07:00
Christopher Willis-Ford d1c3cf8bb0 Move image-from-storage code into new ScratchImage component 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford a09c7ddb53 Clarify getAssetTypeForExtension 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford fec81c93a3 Make sure icon load starts immediately 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford 2b3c70dfc3 Move event processing out of LibraryItemComponent 2019-03-12 14:38:25 -07:00
Christopher Willis-Ford db9236bef2 Fix sprite lib animation: move load into LibraryItem
The `LibraryItem` component has been split into a container, responsible
for handling interaction with the storage module, and a component,
responsible for presentation. The component now always takes an
`iconURI` and the logic to load an icon from storage has been moved from
`Library` into `LibraryItem`.

TODO: move animation logic from `SpriteLibrary` into `LibraryItem`. This
should simplify the code quite a bit and might also improve performance.
2019-03-12 14:38:25 -07:00
Paul Kaplan 3a33e7ea86 Update blocks.jsx 2019-03-12 14:34:45 -04:00
Paul Kaplan 51f9aafec1 Remove analytics library imports 2019-03-11 15:41:07 -04:00
Paul Kaplan e746b98d83 Remove some of the high-volume analytics events
Too much traffic, not enough value. Leaving stuff having to do with tips library/tutorial card navigation as well as hardware extension connectivity, as those help us find issues with Scratch.
2019-03-11 15:14:30 -04:00