Commit graph

3433 commits

Author SHA1 Message Date
Karishma Chadha
73f55ee9a8 Fixing issue where switching sprites was causing variable getter of a renamed variable to switch back to the old name. 2018-01-19 10:27:10 -05:00
Karishma Chadha
259751158a Indentation 2018-01-19 09:52:53 -05:00
Karishma Chadha
0fe160f5ba Code cleanup. Fixing indentation and some todo comments. 2018-01-19 09:50:35 -05:00
Karishma Chadha
d1e38bf6bf Code cleanup of field variable initModel. Moving broadcast specific code into separate function. 2018-01-19 09:49:48 -05:00
Karishma Chadha
19be9aee19 Fixing issue with renaming variable not updating field variable getters on the workspace. Code cleanup of rename option callback. 2018-01-19 09:21:18 -05:00
Karishma Chadha
01cd09929d Reverting deletion of procedure_test.js 2018-01-18 15:03:46 -05:00
Karishma Chadha
8b5762581b Code cleanup, removing todo comments. 2018-01-18 15:03:46 -05:00
Karishma Chadha
ec257e51ca Fixing errors from previous merge conflict resolution. 2018-01-18 15:03:46 -05:00
Rachel Fenichel
7102012240 Pulling in final changes from upstream blockly/variables_by_id branch.
Includes commits 1fa27fa (01/12/18) through fa91c6b (01/16/18).
2018-01-18 15:03:46 -05:00
Karishma Chadha
06316d4456 Fixing issue where toolbox wasn't refreshing when adding a list with the same name as a variable. 2018-01-18 15:03:46 -05:00
Karishma Chadha
61e0d89de0 It's better to provide as much information about the variable as we have available. When using the 'Make a Variable' button, we know that we want to make a scalar variable, so pass in that information. 2018-01-18 15:03:46 -05:00
Karishma Chadha
8962f2b0e4 One sentence summary.. 2018-01-18 15:03:46 -05:00
Karishma Chadha
f19c5569bf Adding JSDoc for realizePotentialVar function, explaining its use. 2018-01-18 15:03:46 -05:00
Karishma Chadha
d8a63f3aa4 Fixing issue where importing an SB2 project that uses the 'message1' default broadcast message wasn't wokring because of the way the realizePotentialVars function was written. The imported 'message1' broadcast message was conflicting with the one that is a potential variable in the flyout. 2018-01-18 15:03:46 -05:00
Karishma Chadha
62b85298dc Temporary fix for delete variable option not working from context menu of field_variable_getter from the flyout. This will be fixed upstream. 2018-01-18 15:03:46 -05:00
Karishma Chadha
2aabea010b Fixing errors and making unit tests work. 2018-01-18 15:03:46 -05:00
Karishma Chadha
8eb243f150 Making field variable getter work with newest changes. 2018-01-18 15:03:46 -05:00
Rachel Fenichel
855ec2665a Pulling in the latest changes from google/blockly/variables_by_id branch,
starting with commit 6218750 (December 19, 2017) through commit 80b397f (January 10, 2018).
2018-01-18 15:03:46 -05:00
Karishma Chadha
ddf61c146b Fixing accidental error caused from copy-pasting. 2018-01-18 15:03:46 -05:00
Karishma Chadha
1065bc262e Don't need to type check for field variable getter since it will only ever be associated with one variable, unlike field_variables which have dropdown menus which could potentially refer to variables of various types. 2018-01-18 15:03:46 -05:00
Karishma Chadha
87740cdea7 Fixing behavior where converting a potential variable into a real variable (e.g. dragging out a broadcast block out of the flyout with the default 'message1' option selected or creating a new message called 'message1' from the flyout) keeps the variable in both the potential variable map as well as the real variable map, so dropdown menus in the broadcast blocks from the flyout will display duplicate entries for the variable. 2018-01-18 15:03:46 -05:00
Karishma Chadha
c3af522919 Making implicit-deletion work again. 2018-01-18 15:03:46 -05:00
Karishma Chadha
af099d514b Partially working status. Things that don't work: broadcast-messages (dragging out 'message1' block creates two 'message1' options in the flyout block dropdowns)... -- this problem has been partially addressed in a separate branch 'broadcast-message-flyout'; variables - largely don't work, having issues with toolbox not refreshing. 2018-01-18 15:03:46 -05:00
Karishma Chadha
95b405bbd7 field dropdowns are the right size again. 2018-01-18 15:03:46 -05:00
Karishma Chadha
0d74e1e852 Code cleanup and re-disabling new message option from flyout for the time being, until flyout behavior is completely fixed. 2018-01-18 15:03:46 -05:00
Karishma Chadha
6de6e9f3b9 Can create new messages now...
Broadcast messages from flyouts also work now. Re-enabling new message option from broadcast blocks in flyout.
One behavior that is different from current functionality is that 'message1' will not exist in dropdown menus outside the flyout unless a broadcast block w/'message1' selected is dragged out of the flyout
(thus creating 'message1' as a variable in the target workspace).
A problem with this is that we can currently create 'message1' as a new variable (from a block in the flyout), and then blocks in the flyout will have two 'message1' options in the dropdown. Still need to investigate a fix for this.
2018-01-18 15:03:46 -05:00
Karishma Chadha
6d89e85ea3 Setting field variable dropdown default type to the single type in the variables list if the list has only one element in it. 2018-01-18 15:03:46 -05:00
Karishma Chadha
5d42bedd3b Fixing xml to block (and vice-versa) translation for variables. 2018-01-18 15:03:46 -05:00
Karishma Chadha
82e4cdc624 Fixing linter error. 2018-01-18 15:03:46 -05:00
Karishma Chadha
db44603362 Pulling in changes from blockly/variables_by_id. 2018-01-18 15:03:46 -05:00
Paul Kaplan
1afb6a2c67
Merge pull request #1339 from ericrosenbaum/bugfix/droppability-audit
Make some blocks non-droppable by removing menu shadows
2018-01-12 15:17:11 -05:00
Paul Kaplan
3c87a3b930
Merge pull request #1340 from paulkaplan/fix-edge-baseline
Fix text alignment on Edge
2018-01-11 16:39:03 -05:00
Paul Kaplan
7bf82e08bf Manually offset text for IE / Edge 2018-01-10 16:42:22 -05:00
Paul Kaplan
824b2fa5e7 Offset svg text to compensate for no dominant-baseline property on edge 2018-01-10 15:25:12 -05:00
Eric Rosenbaum
367776523a Make some blocks non-droppable by removing menu shadows 2018-01-10 14:40:06 -05:00
DD Liu
fd59d1689a
Merge pull request #1337 from fsih/removeOfMonitor
Remove monitor on of
2018-01-10 11:26:23 -05:00
DD
a3e0910c25 remove monitor on of 2018-01-09 17:23:29 -05:00
Paul Kaplan
9409feef82
Merge pull request #1332 from paulkaplan/costume-backdrop-blocks
Modify costume and backdrop reporters to be more consistent / flexible
2018-01-04 22:06:29 -05:00
Paul Kaplan
6b6e425e87 Update looks reporters to use menu for costume or backdrop number/name 2018-01-04 10:00:10 -05:00
Paul Kaplan
11cf4bdeb9
Merge pull request #1325 from paulkaplan/drag-mode-block
Add drag mode block sensing block
2017-12-29 09:38:57 -05:00
Paul Kaplan
b39800f35a
Merge pull request #1326 from paulkaplan/layering-blocks
Layer blocks change "go to front/back" and "go forward/backward N layer"
2017-12-28 14:56:55 -05:00
Paul Kaplan
ee13c2d5be Layer blocks change "go to front/back" and "go forward/backward N layer" 2017-12-28 13:04:49 -05:00
Paul Kaplan
d286299412 Update drag mode block comment. 2017-12-28 12:50:45 -05:00
Paul Kaplan
6277131afd Rename field 2017-12-28 12:28:26 -05:00
Paul Kaplan
9ced242a39 Fix linting 2017-12-28 12:25:57 -05:00
Paul Kaplan
35fbe5d32e Add drag mode block sensing block 2017-12-28 12:18:47 -05:00
Paul Kaplan
32a689e38a
Merge pull request #1324 from paulkaplan/undo-illegal-proc-delete
Prevent deleting a procedure definition if there are callers.
2017-12-27 11:47:31 -05:00
Paul Kaplan
673d50e024
Merge pull request #1302 from kchadha/broadcast-input-fields
Broadcast Inputs and Implicit Message Deletion
2017-12-27 11:47:16 -05:00
Paul Kaplan
b791da9f3b Roll back drag definition deletion if it orphans call blocks. 2017-12-27 11:22:48 -05:00
Paul Kaplan
793bbcfc33
Merge pull request #1322 from sjhuang26/issue-gui1019-custom-procedure-input
Change wording in create new block dialog
2017-12-27 11:15:43 -05:00