Commit graph

1930 commits

Author SHA1 Message Date
marisaleung
a6f85cec53 Appease eslint: semicolons and such. 2017-05-25 13:44:06 -07:00
Rachel Fenichel
c0b906f4b6 Create grid object (#1131)
* Create grid object

* Doc

* Units!  Thanks @RoboErikG
2017-05-24 16:14:24 -07:00
marisaleung
bebbf8fd39 Merge pull request #1130 from marisaleung/develop_deserialization_variables_at_top
Develop deserialization variables at top
2017-05-24 15:35:30 -07:00
marisaleung
dc06872a37 Deserialization variables at top. 2017-05-24 15:29:46 -07:00
Rachel Fenichel
71066faff6 Move blockSvg.getHeightWidth to block_render_svg.js (#1118) 2017-05-24 13:38:46 -07:00
marisaleung
3d1420ba5f Merge pull request #1127 from marisaleung/develop_top_variables_dom
Include Variables at the top of dom.
2017-05-24 11:03:09 -07:00
marisaleung
ce4a84b3cf Include variables at top of serialization. 2017-05-24 10:53:44 -07:00
marisaleung
b5ad5c6185 Merge pull request #1125 from marisaleung/develop_toolbox_uses_targetworkspace_variableMap
Make flyout get variables from target workspace's variableMap.
2017-05-24 10:39:50 -07:00
Rachel Fenichel
3f58abfd8e Update contributing.md (#1126) 2017-05-23 14:59:39 -07:00
marisaleung
c246e41bec Merge pull request #1123 from marisaleung/develop_fix_require
Require VariableModel in field_variable.js.
2017-05-23 14:00:19 -07:00
marisaleung
7603f9aa69 Require VariableModel in field_variable.js. 2017-05-23 13:36:24 -07:00
marisaleung
7d57143f75 Make flyout get variables from target workspace's variableMap. 2017-05-23 11:59:13 -07:00
marisaleung
e84121690b Merge pull request #1113 from marisaleung/SmallFix
Small fix
2017-05-23 11:40:39 -07:00
marisaleung
67906939cd Merge pull request #1117 from marisaleung/develop_updateVariablesXml
Add variable info to xml generated in variables.js
2017-05-23 11:40:02 -07:00
Rachel Fenichel
620a210106 Move audio code to a new file (#1122)
* move audio code to a new file

* dispose

* null check
2017-05-22 16:58:31 -07:00
Andrew n marshall
10ad450176 Forgot update code demo (#1121) 2017-05-22 12:34:22 -07:00
Andrew n marshall
3840b3804f Replacing latest prettifier hosted in repo with latest version at rawgit CDN. (#1120) 2017-05-22 12:09:23 -07:00
RoboErikG
c53605fef4 Add missing CLAs info to the contributing file (#1119)
* Add missing CLAs info to the contributing file

* Added larger changes paragraph
2017-05-22 11:33:30 -07:00
marisaleung
3b34038445 Add variable info to xml generated in variables.js 2017-05-19 17:07:12 -07:00
Rachel Fenichel
65908e8874 Spelling. Spelling is hard. 2017-05-19 16:31:12 -07:00
Rachel Fenichel
104958e25f Cleanup: semicolons, spacing, etc. (#1116) 2017-05-19 16:27:48 -07:00
Derek Brown
63fe91180b Add image_onclick option (#1080) 2017-05-19 16:18:54 -07:00
Rachel Fenichel
d4694b49d3 Click events on shadow blocks have the correct id (#1089) 2017-05-19 16:16:01 -07:00
Rachel Fenichel
7395c24bf0 Fix apostrophe in tooltips and helpurls (#1111) 2017-05-19 16:14:53 -07:00
marisaleung
90eeaae8bf Merge pull request #1112 from marisaleung/Add_type_and_id_info_to_xml
Add type and id info to xml
2017-05-19 15:49:02 -07:00
marisaleung
1cd8e1fcc1 Add type, id, and info to the generated xml.
Add xml tests for fieldToDom.
Update workspace tests to pass with new changes.
2017-05-19 15:47:39 -07:00
marisaleung
cd5bb0d888 Changed parameter name in workspace for clarity. 2017-05-18 14:14:17 -07:00
marisaleung
eeaf92fe85 Merge pull request #1108 from marisaleung/FixRequire
Fix require
2017-05-17 15:01:09 -07:00
marisaleung
5fddba7545 Add VariableMap requirement to workspace. 2017-05-17 14:51:29 -07:00
marisaleung
78e4977bdc Merge pull request #1107 from marisaleung/develop
Edit generators to read in Variable Models.
2017-05-16 17:28:52 -07:00
marisaleung
dc97909abd Edit generators to read in Variable Models. 2017-05-15 12:19:04 -07:00
RoboErikG
14e4f1905e Change registration link to a static one (#1106)
This lets us redirect to a different form if we change it in the future.
2017-05-15 11:31:17 -07:00
marisaleung
8d5edb3e55 Merge pull request #1096 from marisaleung/develop
Assign variable UUID to field_variable dropdown.
2017-05-15 10:56:56 -07:00
marisaleung
6492f2988a Assign variable UUID to field_variable dropdown. 2017-05-15 10:43:53 -07:00
picklesrus
48a5270072 Fix #1077 by adding a rule to cover the toolbox labels too. (#1099) 2017-05-12 11:29:52 -07:00
shirletan
7a2c01e1cf Work around timing issue with travis osx issue (#1092)
* add more wait time for test setup

* increase selenium wait time

* add more wait
2017-05-09 16:39:39 -07:00
shirletan
65e374e309 add more wait time for test setup (#1091) 2017-05-09 10:50:27 -07:00
marisaleung
cc93e1c6e8 Merge pull request #1085 from marisaleung/develop
Names are correctly fetched from VariableModels.
2017-05-09 10:03:37 -07:00
marisaleung
2bb258165a Names are correctly fetched from VariableModels! 2017-05-09 08:50:11 -07:00
shirletan
f8fa9748e9 add osx travis test run job (#1074) 2017-05-05 13:12:53 -07:00
Rachel Fenichel
920422196f Tidy up context menu code. (#1081) 2017-05-05 12:57:40 -07:00
Rachel Fenichel
98914fcf6b Dragging changes, rebased on develop (#1078)
* Add block drag surface translateSurfaceBy

* Add dragged connection manager

* Add gesture.js

* Add GestureHandler

* Implemented gesture skeleton

* Most basic workspace dragging

* Add dragged connection manager

* cleanup

* doc

* more cleanup

* Add gesture handler

* Add translateSurfaceInternal

* core/block_dragger.js

* cleanup

* Pull in changes to dragged connection manager

* Pull in changes to dragged connection manager

* comments

* more annotations

* Add workspace dragger

* Add coordinate annotations

* Start on block dragging

* Limit number of concurrent gestures

* Add some TODOs

* start using dragged connection manager

* Set origin correctly for dragging blocks

* Connect or delete at the end of a block drag.

* cleanup

* handle field clicks and block + workspace right-clicks

* move code into BlockDragger class, but still reach into Gesture internals a lot

* Clean up block dragger

* Call blockDragger constructor with correct arguments

* Enable block dragging in a mutator workspace

* Add workspace dragger

* click todos

* Drag flyout with background

* more dragging from flyout

* nit

* fix dragging from flyouts

* Remove unused code and rename gestureHandler to gestureDB

* Rename gesture handler

* Added some jsdoc in gesture.js

* Update some docs

* Move some code to block_svg and clean up code

* Lots of coordinate annotations

* Fix block dragging when zoomed.

* Remove built files from branch

* More dragging work (#1026)

-- Drag bubbles while dragging blocks
-- Use bindEventWithChecks to work in touch on Android. Not tested anywhere else yet.
-- Handle dragging blocks while zoomed
-- Handle dragging blocks in mutators
-- Handle right-clicks (I hope)
-- Removed lots of unused code

* More dragging work (#1048)

- Removed gestureDB
- Removing uses of terminateDrag
- Cleaned up disposal code

* Dragging bugfixes (#1058)

- Get rid of flyout.dragMode_ and blockly.dragMode_
- Make drags from the flyout start from the top block in the group
- Block tooltips from being scheduled or shown during gestures
- Don't resize mutator bubbles mid-drag

* Fix events in new dragging (#1060)

* rebuild for testing

* unbuild

* Fix events

* rebuild

* Fix up cursors

* Use language files from develop

* Remove handled TODOS

* attempt to fix IE rerendering bug, and recalculate workspace positions on scroll

* Rebuild all the things

* Comment cleanup; annotations; delete unused variables.
2017-05-05 12:42:53 -07:00
Andrew n marshall
8c46d7c798 Improve errors when validating JSON block definitions. (#1086)
goog.asserts to not run from blockly_compressed.js. User data validation should always run.
2017-05-05 11:14:54 -07:00
Rachel Fenichel
55096aeb16 Fix #1051 (#1084) 2017-05-05 09:36:24 -07:00
marisaleung
ee58eb4791 Merge pull request #1079 from marisaleung/develop
Created separate file for VariableMap
2017-05-04 12:41:36 -07:00
marisaleung
6d882cb2e1 Merge branch 'develop' into develop 2017-05-04 12:40:49 -07:00
marisaleung
0e0b1a3ebd Merge branch 'develop' into develop 2017-05-04 12:38:15 -07:00
marisaleung
12ea998155 Created separate file for VariableMap 2017-05-03 17:04:15 -07:00
marisaleung
2b1fe1c4e3 Merge pull request #1071 from marisaleung/develop
VariableMap and functions added.
2017-05-03 13:20:05 -07:00
marisaleung
d903b5e86b VariableMap and functions added. 2017-05-03 10:51:24 -07:00