Commit Graph

3101 Commits

Author SHA1 Message Date
alschmiedt b8a2ccddb0 Debuggin 2018-12-19 16:10:45 -08:00
alschmiedt 3a63ae6feb Comment out removing tmp directory for testing 2018-12-19 15:22:49 -08:00
alschmiedt f125065a17 Merge branch 'develop' of https://github.com/alschmiedt/blockly into blockly_colours 2018-12-19 10:39:10 -08:00
alschmiedt 8544491228 Small fixes 2018-12-19 09:53:54 -08:00
alschmiedt 3b92380872 Fix link to color.js 2018-12-19 08:48:29 -08:00
alschmiedt 967c7db5f9 Changes high contrast colors 2018-12-19 08:45:38 -08:00
alschmiedt 9afe497b7e Fixes jsdocs 2018-12-19 08:45:20 -08:00
alschmiedt ddaae6e3bf Script to convert single color to primary, secondary, tertiary colors 2018-12-18 14:45:24 -08:00
alschmiedt b9efa72161 Small cleanup 2018-12-18 14:05:44 -08:00
alschmiedt 692555cf1c Fixes broken set_style test 2018-12-18 13:58:09 -08:00
Sandeep Dubey b5146036e1 Fix #1632: Added alt attribute to the field image. (#2178)
* Added alt for field image.

* Removed lint issues.
2018-12-18 13:38:53 -08:00
alschmiedt 2481274406 Small cleanup 2018-12-18 13:36:23 -08:00
Beka Westberg dcae85dd4f Added maxTrashcanContents Property to Workspace Options (#2183)
* Added maxTrashcanContents property to workspace options.

* Changed default with trashcan to 32.
2018-12-18 13:22:43 -08:00
alschmiedt efb51eec6a Fix multi playground to work with style 2018-12-18 12:42:33 -08:00
Rachel Fenichel 468df8749f Merge pull request #2176 from BeksOmega/fixes/2175
Changed Warnings to Interact Properly with Collapsing/Expanding.
2018-12-18 11:09:49 -08:00
alschmiedt 2fa7ab2825 Fixes setting border and updating shadow color 2018-12-18 10:57:20 -08:00
alschmiedt 5ba66a3418 Removes unnecessary event firing 2018-12-18 10:56:40 -08:00
alschmiedt be78838335 Allows user to define style name using variables in json 2018-12-18 10:50:49 -08:00
alschmiedt c226654b77 Adds style name constants 2018-12-18 10:47:43 -08:00
alschmiedt 75212a7413 Adds ability to choose different styles in playground 2018-12-18 10:03:55 -08:00
alschmiedt 712bfd70fe Adds three new styles 2018-12-18 10:02:10 -08:00
alschmiedt 034bcb00bb Replace setting colour to setting style in block definitions 2018-12-18 10:01:05 -08:00
Rachel Fenichel b3ef429d74 Merge pull request #2180 from epicfaace/feature/scroll
Scroll very long context menus
2018-12-18 09:21:33 -08:00
Ashwin Ramaswami 2cc3a8b3d9 Scroll very long context menus 2018-12-18 08:41:14 -05:00
Beka Westberg 8241068630 Updated JSDoc. 2018-12-17 15:29:25 -08:00
Rachel Fenichel 261a067a31 Merge pull request #2157 from BeksOmega/feature/TrashcanContents
Added flyout to trashcan to "get back" deleted blocks.`
2018-12-17 15:23:17 -08:00
Beka Westberg 44df2d4680 Changed parent blocks to display "Collapsed blocks contain warnings." instead of having warnings "bubble up" from children. Added message to msg/messages.js . 2018-12-17 14:54:56 -08:00
Rachel Fenichel e4690902de Merge pull request #2179 from DubeySandeep/PHP-text-outerOrder
Fix #2161: Changes outerOrder for PHP/text component.
2018-12-17 13:28:20 -08:00
translatewiki.net 78f7efed00 Localisation updates from https://translatewiki.net. 2018-12-17 08:48:24 +01:00
Sandeep Dubey 8d09419afc Changes outerOrder for PHP/text component. 2018-12-16 22:32:19 +05:30
Beka Westberg f16cdf912d Changed Warnings to Interact Properly with Collapsing/Expanding. 2018-12-15 15:52:34 -08:00
Rachel Fenichel 1ed058587c Merge pull request #2173 from rachel-fenichel/rebuild_12_14_18
Rebuild uncompressed and language files
2018-12-14 15:41:44 -08:00
Rachel Fenichel b58f3b1e48 Rebuild uncompressed and language files 2018-12-14 15:05:29 -08:00
Rachel Fenichel 1f076d7226 Merge pull request #2171 from rachel-fenichel/update_dependencies
Update dependencies
2018-12-14 14:54:16 -08:00
Rachel Fenichel b7446e195c Update dependencies 2018-12-14 12:42:03 -08:00
Rachel Fenichel 4ee14201a9 Merge pull request #2170 from rachel-fenichel/disable_insertion_markers
Disable insertion markers for the December 2018 release
2018-12-14 11:13:27 -08:00
Rachel Fenichel e182f43d12 Disable insertion markers for the December 2018 release 2018-12-14 10:57:39 -08:00
alschmiedt 91cc05abf3 Merge pull request #2168 from alschmiedt/procedure_events
Groups events fired during field input change
2018-12-13 14:55:45 -08:00
alschmiedt 4bd21c5128 Added todo 2018-12-13 14:39:27 -08:00
alschmiedt aae15f01f4 Groups events fired during field input change 2018-12-13 12:52:55 -08:00
alschmiedt 0c66429f5c Merge pull request #2167 from alschmiedt/mutation_actions
Reconnects child blocks when an undo is done on an else block
2018-12-13 10:38:30 -08:00
alschmiedt 3bf9337205 Fixed comment 2018-12-13 10:32:38 -08:00
alschmiedt 094418f928 Reconnects child blocks when an undo is done on an else block 2018-12-13 08:11:16 -08:00
translatewiki.net 2ba045634e Localisation updates from https://translatewiki.net. 2018-12-13 09:01:02 +01:00
Beka Westberg 77ee4c8e22 Reverted to storing xml as text. 2018-12-12 15:20:12 -08:00
RoboErikG e49d07dd16 Propagate the event group when enforcing bounds on blocks (#2163)
Fixes #1653

Makes the bounds checker created in inject correctly set the event group
before moving blocks in bounds.

When a workspace can't scroll the inject method sets up an event listener
to bump blocks back into the visible bounds when dropped off the edge. The
event group wasn't being used, though, causing the move to be a separate
undo step. When undone, this would get you stuck in a loop where the
workspace would keep pulling it back into the visible range.
2018-12-12 13:03:25 -08:00
alschmiedt 4918da9538 Adds ability to provide a hue value for primary colour 2018-12-12 11:39:23 -08:00
Beka Westberg 39b7f95827 Renamed var block to node in cleanBlockXML_. 2018-12-12 06:50:35 -08:00
Beka Westberg 5f2d5df321 Fixed nits. Changed contents to store XML. Added removing IDs from all descendants. Removed deleteNext. 2018-12-11 16:46:24 -08:00
alschmiedt fbd44c80f9 Adds tests for adding blockly styles 2018-12-11 13:25:53 -08:00