ScCN/scratch-gui
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,169 Commits 3 Branches 499 Tags
1fd9a1f689594db4e865ebf0d6b70e422f9bec2b
Commit Graph
1307 Commits
Author SHA1 Message Date
Christopher Willis-Ford 1fd9a1f689 Merge branch 'develop' into load-library-images-through-storage 2019-03-14 11:49:47 -07:00
Chris Willis-Ford 33f3d1d79b Merge pull request #4645 from cwillisf/add-telemetry-hooks 
Add telemetry hooks
 2019-03-14 10:47:59 -07:00
Christopher Willis-Ford 5051ba2105 Code review: remove dead code, clarify arg name 2019-03-14 10:35:39 -07:00
Evelyn Eastmond 98ec67d728 Merge pull request #4641 from evhan55/feature/extensions-wifi-icon 
Allow for both bluetooth and internet connection icons in extensions
 2019-03-13 19:39:57 -04:00
Chris Willis-Ford f773ee2dab Merge branch 'develop' into load-library-images-through-storage 2019-03-13 16:33:38 -07:00
Christopher Willis-Ford a7487fb26d Fix ScratchImage current jobs count going NaN 2019-03-13 16:00:24 -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 ce5aa9fb7a Fix ScratchImage visibility check on Windows Firefox ESR 2019-03-13 11:09:36 -07:00
Christopher Willis-Ford f6b9f11d3b 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 16:13:40 -07:00
Christopher Willis-Ford 5c4f50c1b8 Merge branch 'develop' into scratch-desktop 2019-03-12 16:13:28 -07:00
Christopher Willis-Ford 4d671ddfab Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 16:13:27 -07:00
Christopher Willis-Ford 94901b33fe Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 16:13:27 -07:00
Christopher Willis-Ford f6dc2726b5 Implement projectDidSave telemetry event 2019-03-12 16:13:21 -07:00
Christopher Willis-Ford 790fc13157 Fix ScratchImage incompatibilities 2019-03-12 15:01:50 -07:00
Christopher Willis-Ford 5c16407818 Fix imageSource for rotating library icons 2019-03-12 15:01:50 -07: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 f600e6095e Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford d952f774dd Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:25 -07:00
Christopher Willis-Ford 38ee27d896 Merge remote-tracking branch 'upstream/develop' into scratch-desktop 2019-03-12 15:01:24 -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 46ce75bf2a Prevent crash when opening tutorials library 2019-03-12 15:01:23 -07:00
Christopher Willis-Ford 2c285fee8a Load 6 ScratchImages at a time, prioritize visible 2019-03-12 15:01:08 -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 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
Evelyn Eastmond f29b82b636 Adding right padding to icons. 2019-03-12 10:39:27 -04:00
Evelyn Eastmond 31625d6807 Adding ability to show both bluetooth and internet icons in extension library item tiles. 2019-03-12 10:10:59 -04:00
unknown dadef73bfa Testing two icons side by side to see how the padding is currently working. 2019-03-12 09:39:24 -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 abf49b3115 Fix more prop ordering for linter 2019-03-11 11:05:16 -04:00
Paul Kaplan a627552c8e Fix prop ordering for linter 2019-03-11 10:58:09 -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
apple502j ef05591d20 Remove decimal option and use type=text 2019-03-08 19:32:01 +09:00
Benjamin Wheeler c83d85e368 Merge pull request #4589 from JinXJinX/fix_account_nav 
fix(UI): fix cursor property when hovering account nav items
 2019-03-07 15:48:50 -05:00
Paul Kaplan d8d39b1d61 Merge pull request #4585 from JinXJinX/develop 
fix(css): fix css value has mixed support warning
 2019-03-07 13:31:39 -05:00
Eric Rosenbaum 08ec713bff update scratch link icon 2019-03-04 14:10:20 -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
Xu Jing 742e9e327a fix(UI): fix cursor property when hovering account nav items 2019-02-25 18:11:27 -05:00
Xu Jing 9efcadad5d fix(css): fix css justify-content property's value 'start, end' has mixed support warning 2019-02-25 01:51:53 -05:00
apple502j d431c3f8ba Slider range change with decimal value support 2019-02-17 08:58:20 +09:00
Paul Kaplan a10704c44b Merge pull request #4528 from paulkaplan/ask-above-monitors 
Put the ask blocks text input above the monitors on the stage.
 2019-02-13 16:29:55 -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 4927e12e80 Share the replace project confirmation string between new and upload 2019-02-13 09:29:05 -05:00
Paul Kaplan cae9d9a683 Merge branch 'develop' into nj/ui-changes 2019-02-12 09:04:31 -05:00
Paul Kaplan 0ae9d70685 Support the isDiscrete flag on slider monitors 2019-02-11 11:19:41 -05:00
Paul Kaplan 3993d5c8f1 Put the ask blocks text input above the monitors on the stage. 2019-02-11 10:45:03 -05:00