Commit Graph
1332 Commits
Author SHA1 Message Date
Evelyn Eastmond 96bd677ef9 Starting to add an onToggleCards prop. 2019-05-07 11:42:40 -04:00
Evelyn Eastmond b77bc7a8b4 Adding a new div to hold the shrink button. 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
Ben Wheeler 16024769c8 renamed confirm-replace-hoc to menu-bar-hoc; moved project changed checking there 2019-04-30 15:02:22 -04:00
Paul Kaplan 7c26245c53 Merge pull request #4757 from paulkaplan/remove-feedback-button
Remove unneeded feedback button in menubar
2019-04-23 08:32:09 -04:00
Benjamin Wheeler cf9e165ccf Merge pull request #4676 from mzgoddard/menu-bar
Move projectChanged into HOC wrapping MenuBar, to avoid unnecessary renders
2019-04-19 17:29:10 -04:00
Paul Kaplan 6e50909e0f Remove feedback icon 2019-04-19 13:17:48 -04:00
Paul Kaplan 6480b262de Remove unused import 2019-04-19 13:17:26 -04:00
Paul Kaplan 8eb9e37d67 Remove unneeded feedback button in menubar
It is no longer needed, as the playground is no longer the public face of scratch gui
2019-04-18 13:49:28 -04:00
Benjamin Wheeler 5c1d3e38bd Merge pull request #4710 from benjiwheeler/only-autosave-if-changed
Share, See-project-page buttons will only save if project has changed
2019-04-17 14:55:22 -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
Evelyn Eastmond 4aba90c8fb Merge pull request #4724 from evhan55/bugfix/4668
Changing tutorial video width to be smaller
2019-04-12 14:35:03 -04:00
Paul Kaplan 0fbbf55b51 Revert "Load library images through storage" 2019-04-11 11:13:34 -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
Evelyn Eastmond 5b4daec4ab Fixing video height in iframe so the video controls show better. 2019-04-09 13:57:25 -04:00
Evelyn Eastmond aed66d49cf Changing tutorial video width to be smaller and match other tutorial steps. Cutting off video by about 5 pixels on the bottom to prevent any jittering between steps. 2019-04-09 13:53:45 -04:00
Ben Wheeler 881e17dc67 See project page button will only save if user can save AND project has changed 2019-04-01 14:40:48 -04:00
Michael "Z" Goddard fc8c242173 separate projectChanged, MenuBar doesn't need it to render
Rendering the MenuBar does not depend on projectChanged. Some of its
event handling does. Abstracting that dependency we can handle some
behaviour in MenuBar without extra renders.
2019-03-27 11:12:30 -04:00
Eric Rosenbaum 4fab686aea Prevent crash on load hardware ext without assets 2019-03-26 15:59:03 -04:00
Christopher Willis-Ford 28cd140d9f Cancel ScratchImage load if unmounted 2019-03-18 12:58:25 -07:00
Christopher Willis-Ford 5f6b89ec2a Simplify unnecessarily complicated loop 2019-03-18 12:07:41 -07: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
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