Commit Graph
1213 Commits
Author SHA1 Message Date
chrisgarrity 29f34efe0b Merge pull request #1920 from chrisgarrity/update-l10n
Add translation to missing strings
2018-05-01 08:23:46 -04:00
Paul Kaplan ebaec99b30 Merge pull request #1918 from paulkaplan/fix-costumes-backdrops-tab
Show "Backdrops" instead of "Costumes" in tab text if stage is selected.
2018-04-30 17:33:13 -04:00
kchadha abc79fe03c Merge pull request #1880 from kchadha/video-refactor
Refactor Video IO
2018-04-30 16:58:00 -04:00
Karishma Chadha 6eaba09189 Merge branch 'video-refactor' of github.com:kchadha/scratch-gui into video-refactor 2018-04-30 16:24:11 -04:00
Karishma Chadha 45e413c3f5 Remove old comments referencing VM. 2018-04-30 16:23:48 -04:00
Paul Kaplan 1a5adeb90c Merge pull request #1915 from paulkaplan/fix-costume-crash
Protect against showing costume tab for target that does not exist.
2018-04-30 15:10:06 -04:00
Paul Kaplan 9e69478923 Show "Backdrops" instead of "Costumes" in tab text if stage is selected. 2018-04-30 14:55:52 -04:00
Paul Kaplan dd48a86ba1 Fix lint error 2018-04-30 14:36:54 -04:00
Paul Kaplan 97d3f85762 Update targets list and editing target at the same time.
Prevent crashes resulting from the editing target not being on the target list.
2018-04-30 14:11:38 -04:00
Andrew Sliwinski 571f40560e Revert "Bring back "Updates to preview modal for release"" 2018-04-30 14:09:12 -04:00
Paul Kaplan bb4ba90b39 Merge pull request #1911 from paulkaplan/no-select-sound-buttons
Make sound editor buttons unselectable
2018-04-30 12:41:51 -04:00
chrisgarrity 45032cc291 Add translation to missing strings
Question, should ‘x’ and ‘y’ be localizable?
2018-04-30 12:22:23 -04:00
Eric Rosenbaum 732a3be031 Merge pull request #1869 from ericrosenbaum/feature/key-droppability
Post keyboard event.key
2018-04-30 12:20:34 -04:00
Paul Kaplan 2a6ac6ff4d Merge pull request #1904 from paulkaplan/fix-edge-downloading
Use special method for downloading blobs in Edge
2018-04-30 11:49:25 -04:00
kchadha 3e1505f578 Merge branch 'develop' into video-refactor 2018-04-30 10:01:42 -04:00
Paul Kaplan 3568a36530 Make sound editor buttons unselectable 2018-04-30 10:00:12 -04:00
Paul Kaplan d71e0a0ab9 Merge branch 'develop' into bugfix/scroll-position-stability-2 2018-04-30 09:23:12 -04:00
Karishma Chadha 5c30ae16be Rename function for clarity. 2018-04-30 09:09:55 -04:00
Karishma Chadha 2ca0d8342d Cleanup of modal video manager. 2018-04-30 08:44:58 -04:00
Karishma Chadha 469ff96a88 Separate video provider and modal video manager. Provide hooks in modal video manager for calling functions during stages in enableVideo. 2018-04-29 23:11:07 -04:00
Paul Kaplan 9f7e52a419 Use special method for downloading blobs in Edge 2018-04-27 17:01:09 -04:00
Paul Kaplan 99b914e18c Merge pull request #1888 from LLK/revert-1887-revert-preview-update
Bring back "Updates to preview modal for release"
2018-04-27 16:24:30 -04:00
Paul Kaplan def5898c16 Merge pull request #1889 from paulkaplan/integration-tests-for-how-tos
Add a simple smoke test for the how-to library
2018-04-27 16:23:11 -04:00
Paul Kaplan 44bd1a307c Merge pull request #1899 from paulkaplan/fix-sound-formats
Allow more mime types to be processed.
2018-04-27 15:30:25 -04:00
Paul Kaplan 3de4960618 Allow more mime types to be processed.
Firefox and Safari both process mp3s as having audio/mpeg, and a variety of different audio/wav* possibilities.
2018-04-27 15:25:34 -04:00
Paul Kaplan 7eebe9b355 Add a simple smoke test for the how-to library 2018-04-27 14:30:36 -04:00
Paul Kaplan 97a16f1176 Revert "Revert "Updates to preview modal for release (#1864)"" 2018-04-27 11:44:52 -04:00
Paul Kaplan 7caddb90a9 Revert "Updates to preview modal for release (#1864)"
This reverts commit 29d5619d93.
2018-04-27 11:42:27 -04:00
Paul Kaplan 76bfe175aa Framework and demo content for how-tos inside the editor (#1867)
* WIP tips

* WIP first card stack

* WIP use tips reducer to show things to try

* single card deck similar to mask sequence

* collapse option

* Add zoom card

* WIP tips

* Reorganized to redux

* Add zooming to the gifs

* Blue cards + navigation

* Add tips to new nav bar

* Remove blue

* Update design with icons

* deck updates wip

* Updated card decks

* Add videos to libraries

* Update initial card and clicker preview

* Add backdrop to initial card step.

* WIP use vimeo player instead

* New simple spin deck

* Spin around and say hello decks

* Update button and sub-card styles

* Fix "tips" button in menu bar

* Use move cursor

* Fix cursor

* Use same image for deck preview and library

* Fix cursor again

* Update clicker game deck

* Add videos as single-step decks

* Change tips in menu bar to ? icon

* Change “tips” to “how-tos” in library

* Add help icon to cards

* Update deck library images

* Add drag cover for youtube video to prevent catching mouseup

* add a step to spin deck for clicking control

* Blue bar style updates

* Add step pips

* Update clicker game name to run away

* Fix image padding

* Add change color step to spin deck

* Add start sound step to run away deck

* Update say deck to start with adding a sprite

* Remove package lock

* Remove zooming functionality

* Remove unnecassary prototype changes

* Split up rendering of cards into smaller parts

* Use FormattedMessage for all strings

* Automatic lint fixes

* Almost finished with lint errors!

* Fix more lint errors

* Clean up CSS

* Fix webpack config
2018-04-27 11:11:42 -04:00
Eric Rosenbaum bad3e8a49e Prevent category menu jump on sprite switch 2018-04-27 10:00:22 -04:00
Paul Kaplan a44377b8e1 Remove non-existent block menu definition causing crash 2018-04-27 09:02:46 -04:00
Karishma Chadha e47969ba1c Refactor video io device to pull HTML DOM related functionality into gui, and for resuability of video device with camera modal. 2018-04-26 21:33:18 -04:00
DD 85efa71d74 Rename getCostumeSvg to getCostume 2018-04-26 14:10:06 -04:00
Andrew Sliwinski 29d5619d93 Updates to preview modal for release (#1864)
* Updates to preview modal for release

* Design tweaks and remove import modal

* Resolve issues with tests

* Copy edits HT Eric

* Resolve lint issue with integration test

* One more change to the disclaimer language

* Add line break
2018-04-25 17:47:22 -04:00
kchadha 60cf7f1e5d Merge pull request #1836 from kchadha/costume-file-upload
Upload Costumes and Backdrops (vector and bitmap)
2018-04-25 11:49:51 -04:00
Karishma Chadha 7110eb0026 Refactoring and code cleanup. 2018-04-24 18:22:56 -04:00
Ray Schamp 69e242f051 Merge pull request #1858 from rschamp/feature/modal-back-button
Allow the back button to work with libraries
2018-04-24 16:25:01 -04:00
Karishma Chadha 906f5406ac Rename fileUploader to match file naming conventions. 2018-04-24 13:37:07 -04:00
Karishma Chadha 73cd5b3019 File uploading abstractions 2018-04-24 12:54:38 -04:00
Karishma Chadha 2bf417045e Add bitmap support to backdrop upload button. 2018-04-24 12:44:39 -04:00
Karishma Chadha 4c50363a55 Fixed svg thumbnails, some cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f2b398ae0e Bitmap upload -- mostly working, code needs cleanup. 2018-04-24 12:44:39 -04:00
Karishma Chadha f12718c25b Toggle upload button title based on whether the currently selected sprite is the stage or not. 2018-04-24 12:44:39 -04:00
Karishma Chadha a0cbb07ec0 Remove preventDefault which was preventing the input file browser from popping up 2018-04-24 12:44:39 -04:00
Karishma Chadha 1f0d0e7e5a Backdrop WIP 2018-04-24 12:44:39 -04:00
Karishma Chadha b8b92269df Handle SVG upload (with bitmap coming soon). 2018-04-24 12:44:39 -04:00
Karishma Chadha 3dbd69e682 Costume upload -- very early WIP 2018-04-24 12:44:39 -04:00
Ray Schamp 3c576a0110 Allow the back button to work with libraries
Push to history when the library mounts. Whenever popstate occurs after mounting, request to be closed.

Behavior captured in the `Modal` container. If we want to re-use this functionality for anything else that uses `ModalComponent`, just use the `Modal` container rather than `ModalComponent`.
2018-04-24 09:35:46 -04:00
Ray Schamp afbb63bacc Merge pull request #1841 from rschamp/bugfix/search-height
Make the library filter input full height
2018-04-24 09:27:07 -04:00
Ray Schamp c6bab0a0f1 Merge pull request #1842 from rschamp/bugfix/library-header-height
Account for filter bar in library grid height
2018-04-24 09:26:37 -04:00