ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,280 Commits 3 Branches 499 Tags
6480b262de8ebc7b2816fa35d7101db2f5b9ea6b
Commit Graph
1121 Commits
Author SHA1 Message Date
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
Eric Rosenbaum 4fab686aea Prevent crash on load hardware ext without assets 2019-03-26 15:59:03 -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
Paul Kaplan f72d0b5985 Remove focus selecting in slider prompt 
It is not reliably selecting the input and is making it hard to type into.
 2019-03-11 15:02:46 -04:00
Paul Kaplan 158409d4d8 Merge pull request #4568 from apple502j/slider-decimal 
Slider range change with decimal value support
 2019-03-11 11:19:49 -04:00
Paul Kaplan 127e1a9632 Add container test for slider prompt 
A few modifications were made while making this test:
- Change the "defaultMin/Max" to just be called "min/max", and pass the state through to make the inputs a controlled component. It is best to make form elements controlled since it makes it more clear how data flows.
- Force the passed in data to always be of type `number`, and transform it in the constructor to always be of type `string`, and change the onOk to transform it back to a number. With inputs, it is best to be very explicit about data types, and make it clear where you are using strings and where you are using numbers.
- Do not reset the state to `0` when the field is blank, that makes typing into it very hard (only applies after making it a controlled field)
- Use consistent booleans. Since the VM uses `isDiscrete`, change it so we do not use any opposite flags (like `decimal`) for clarity.

Writing tests for this really helped me understand the behavior. If you read through the test descriptions and see anything you did not intend, let me know.
 2019-03-11 10:51:50 -04:00
Paul Kaplan 438e0f9cf7 Add default values for non-required props 2019-03-11 09:52:48 -04:00
apple502j ef05591d20 Remove decimal option and use type=text 2019-03-08 19:32:01 +09:00
Paul Kaplan f364994a46 Fix trying to get color info before pickX/Y was set 2019-03-07 11:17:48 -05:00
Paul Kaplan b2b4da2f68 Make the stage color picker work with touch. 2019-03-06 11:17:36 -05:00
chrisgarrity 6468395ba5 Merge pull request #4507 from chrisgarrity/issue/3632-localize-tutorials 
Initial version of translated tutorial gifs
 2019-03-04 14:15:15 +01:00
apple502j 8fcfe7c7d7 Set default min/max state value to props default 2019-02-27 20:22:31 +09:00
apple502j d431c3f8ba Slider range change with decimal value support 2019-02-17 08:58:20 +09:00
Paul Kaplan 1a2c3bd0b7 Merge pull request #4563 from paulkaplan/fix-tab-toolbox-refresh 
Request a toolbox refresh after switching between tabs to fix #4561
 2019-02-15 11:27:01 -05:00
Paul Kaplan 9977ec63d5 Merge pull request #4562 from mzgoddard/mouse-move-drag-perf 
Mouse move drag perf
 2019-02-15 09:25:17 -05:00
Paul Kaplan 0f803dfc41 Request a toolbox refresh after switching between tabs to fix #4561 2019-02-15 09:10:42 -05:00
Michael "Z" Goddard 6f101523b4 move when the dragging drawable is extracted from the renderer 
Extracting the drawable art data is very expensive. We should delay
doing that work as long as possible. As such it should wait until a few
more branching return statements before we extract it.
 2019-02-14 16:50:24 -05:00
Paul Kaplan 208060e441 Merge pull request #4534 from paulkaplan/importing-alert 
Show an "Importing..." alert during file import
 2019-02-13 16:30:28 -05:00
Paul Kaplan ac0f004e5a Add error handling for the costumeUpload function 2019-02-13 15:07:17 -05:00
Paul Kaplan 324dc1717c Refactor to handle errors from file reader 2019-02-13 14:47:21 -05:00
Paul Kaplan 59ca7fc771 Merge pull request #4529 from paulkaplan/support-is-discrete-sliders 
Support isDiscrete sliders
 2019-02-13 12:58:38 -05:00
Paul Kaplan 541c43482d Make sure to only close import alert after import is done 2019-02-13 10:27:54 -05:00
Paul Kaplan 7847f9e775 Show an "Importing..." alert during file import 2019-02-13 10:21:48 -05:00
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