Commit Graph
2388 Commits
Author SHA1 Message Date
Paul Kaplan 9b6cd4fc63 Do not activate the already active list item 2018-05-23 10:08:55 -04:00
Paul Kaplan 1377e7b84c Merge pull request #2124 from paulkaplan/viewport-sizing
Force a min viewport size to scroll around the UI instead of breaking
2018-05-22 16:23:07 -04:00
chrisgarrity d92995217e Merge pull request #2083 from chrisgarrity/feature/refactor-gui-store
Feature/refactor gui store

Needed for https://github.com/LLK/scratch-www/issues/1874
2018-05-22 15:05:29 -04:00
Paul Kaplan da8a4af389 Reduce min height so that it barely fits 2018-05-22 14:49:10 -04:00
chrisgarrity afca67cee2 Fix the merge 2018-05-22 14:17:05 -04:00
Paul Kaplan 3006d23e28 Merge pull request #2123 from LLK/greenkeeper/scratch-render-0.1.0-prerelease.20180522141925
chore(package): update scratch-render to version 0.1.0-prerelease.201…
2018-05-22 12:49:13 -04:00
Paul Kaplan 1de7866960 Force a min viewport size to scroll around the UI instead of breaking 2018-05-22 12:46:31 -04:00
greenkeeper[bot] 2a660ca2a4 chore(package): update scratch-render to version 0.1.0-prerelease.20180522141925
Closes #2122
2018-05-22 14:21:16 +00:00
chrisgarrity 1b5cf4dac2 Fix merge conflicts
src/containers/blocks.jsx had changed referring to redux state that needed to be updated to use `state.scratchGui`
2018-05-22 10:00:21 -04:00
Paul Kaplan f623de4df2 Merge pull request #2115 from paulkaplan/fix-fullscreen-inputs
Hide block inputs when entering fullscreen mode
2018-05-22 08:58:23 -04:00
chrisgarrity a6d9dbb4e0 Address review comments
Move guiMiddleware to `reducers/gui.js`, and use it in `app-state-hoc`
2018-05-21 16:54:20 -04:00
chrisgarrity 2e0cc18738 enable See Community button 2018-05-21 16:54:20 -04:00
chrisgarrity a3392bcb8d Export new GUI
scratch-gui exports `index.js` instead of just GUI container.
2018-05-21 16:54:19 -04:00
chrisgarrity 5e51235ffa Remove unneeded code
Since compatibility-testing got switched to use the player mode, it doesn’t need any of the stage/controls components.
2018-05-21 16:54:19 -04:00
chrisgarrity 44c76e5774 Combine GUI reducers
* Export initial states for each reducer
* combine all gui reducers (excludes scratchPaint and intl)
* combine all initial states to create default guiState for preloading in www
* expect all of the gui state to be accessible at `state.scratchGui`
2018-05-21 16:54:19 -04:00
chrisgarrity c182c75c6e Move creating the store into playground examples
GUI will export a reducer to be included in the enclosing component’s redux when GUI is used as a library. The app-state-hoc is moved into the playground examples to provide a store when GUI is being used stand-alone.
2018-05-21 16:51:38 -04:00
DD Liu 59e6e1d15e Merge pull request #2117 from fsih/updateDeps
Pull in optional quirks mode changes
2018-05-21 16:48:28 -04:00
DD 43a2972622 Pull in optional quirks mode chnages' 2018-05-21 16:32:27 -04:00
Paul Kaplan a09c53d820 Add fullscreen mode to modal visibility check 2018-05-21 14:58:53 -04:00
DD Liu bd48a3754f Merge pull request #2111 from LLK/greenkeeper/scratch-paint-0.2.0-prerelease.20180521172423
chore(package): update scratch-paint to version 0.2.0-prerelease.2018…
2018-05-21 14:05:27 -04:00
greenkeeper[bot] 33175cb2b2 chore(package): update scratch-paint to version 0.2.0-prerelease.20180521172423
Closes #1949
2018-05-21 17:24:44 +00:00
Paul Kaplan 4b10ec3d2e Merge pull request #2102 from paulkaplan/monitor-flicker
Fix several minor monitor issues from recent testing
2018-05-21 12:08:04 -04:00
Paul Kaplan 6dfc10e9e1 Merge pull request #2107 from paulkaplan/fix-field-showing
Hide field editors when a modal is shown
2018-05-21 11:23:27 -04:00
Paul Kaplan 200332be96 Do not set transforms at scale: 1, fixing the context menu. 2018-05-21 11:17:11 -04:00
Paul Kaplan 0d399e3887 Disable context menu for monitors in fullscreen mode 2018-05-21 11:16:52 -04:00
Ray Schamp 7912c9a4ee Merge pull request #2104 from LLK/smoke
Smoke test branch -> Develop
2018-05-21 10:25:41 -04:00
Paul Kaplan 4ab312a10b Hide field editors when a modal is shown 2018-05-21 10:25:09 -04:00
Ray Schamp d41ad0d98e Merge pull request #2103 from LLK/hide-paint-font
Update scratch-paint to hide font dropdown
2018-05-21 10:05:32 -04:00
Ray Schamp 9ff80d7d77 Update scratch-paint to hide font dropdown
This is temporary for the release to master
2018-05-21 10:05:02 -04:00
Paul Kaplan be076e0f82 Disable double click to change monitor mode in fullscreen mode 2018-05-21 09:45:59 -04:00
Paul Kaplan 6697002bab Fix slider monitor flickering on safari 2018-05-21 09:43:56 -04:00
Paul Kaplan 24ffa168c6 Remove old todo comment 2018-05-21 09:31:34 -04:00
Paul Kaplan dc5037a4bd Make list monitor remove button reachable and fix overlapping 2018-05-21 09:31:22 -04:00
Paul Kaplan 28e1a4ae05 Make list monitor input full width 2018-05-21 09:29:27 -04:00
Paul Kaplan f3598669fa Make slider monitor full width 2018-05-21 09:29:03 -04:00
Ray Schamp 00c8b6f901 Merge pull request #1987 from rschamp/npm-develop
Publish develop builds to NPM
2018-05-18 11:20:08 -04:00
DD Liu 775d7cc9aa Merge pull request #2093 from fsih/updateFontTool
Update scratch paint
2018-05-17 16:53:40 -04:00
DD 6514844c3f Merge branch 'develop' into updateFontTool 2018-05-17 16:43:29 -04:00
DD 9965d0e1d0 Update scratch paint 2018-05-17 16:37:52 -04:00
Andrew Sliwinski 3642c2b827 Merge pull request #2081 from thisandagain/bugfix/1423
Add missing vector sprites and costumes to libraries
2018-05-17 16:23:40 -04:00
Andrew Sliwinski 0d78411d05 Additional changes from feedback 2018-05-17 16:15:03 -04:00
Andrew Sliwinski f1259db598 Additional changes from feedback 2018-05-17 16:12:57 -04:00
Eric Rosenbaum 3824aaa925 Merge pull request #2084 from LLK/ericrosenbaum-patch-1
Update scratch-blocks (flyout bottom padding)
2018-05-17 11:01:45 -04:00
Eric Rosenbaum b8271ac87f update scratch-blocks (flyout bottom padding) 2018-05-17 09:45:19 -04:00
Ray Schamp ed8b996498 Merge pull request #2082 from paulkaplan/fix-monitor-scaling
Fix monitor scaling, positioning and draggability in fullscreen mode
2018-05-17 09:13:39 -04:00
Paul Kaplan 88d36d3f5c Make monitors not draggable in fullscreen or player mode.
Specifically in 2.0:
- Monitors cannot be dragged in fullscreen/player
- List monitors cannot be resized, have items added using the button or have their values edited.
- Slider monitors still work.
2018-05-16 13:55:13 -04:00
Paul Kaplan 5d0fe72f8b Make monitors position correctly in fullscreen 2018-05-16 13:55:13 -04:00
Paul Kaplan f62e426641 Wrap the monitor list in a CSS scale transform 2018-05-16 13:55:13 -04:00
Andrew Sliwinski dd9924a11d Add missing vector sprites and costumes to libraries. Resolves GH-1423 2018-05-16 11:29:19 -04:00
chrisgarrity d7430001b1 Merge pull request #2077 from chrisgarrity/fix-null-projectid
Don’t load null project id
2018-05-15 14:09:59 -04:00