mirror of
https://github.com/scratchfoundation/scratch-blocks.git
synced 2025-08-28 22:10:31 -04:00
* JSON definitions for colour blocks (#838)
Replaces old colour block definitions with a Blockly.defineBlocksWithJsonArray(..) call. Generator unit tests continue to load and pass, signifying compatibility with prior block definitions.
Replaces extension 'math_number_tooltip' with the reusable 'parent_tooltip_when_inline' extension, also used by colour_picker. Includes tests.
* Rewrite tree.service.js.
- Remove unnecessary code and functions.
- Add documentation where needed.
- Fix a bug arising when a block on the workspace is attached to an existing link.
* Use setValue in fieldTextInput so that procedure renaming works
* Further cleanup and removal of unnecessary functions. Pull some strings out for i18n.
* Use bindEvent_ instead of bindEventWithChecks_ for longStop
* Clean up workspace.component.js. When moving a block from one place to another, move all blocks after it too, and adjust the active descs accordingly.
* Unit tests for JSON block definitions (just the start) (#850)
* Beginnings of a JSON block definition unit test set.
* Dispose of unit test workspaces and blocks in finally blocks.
* Clarify JSON error message by echoing arg notation.
* New blocks text_count, text_replace, and text_reverse (#830)
Includes generators for all languages and units tests on those generators.
* Fixing combo boxes getting out-of-sync with NVDA.
Combo boxes need to be special cased like text input. Also, Escape is
a reserved button in NVDA, so I added Enter as a way to "submit and
move up a level" in addition to escape, so these boxes can be edited
while NVDA is on.
* Temporary fix for broken text field validation.
* rebuild
* Add a block to reverse a list (#844)
* Localisation updates from https://translatewiki.net.
* Porting math.js blocks to JSON (#846)
Moving all `math.js` definitions into a single JSON array, complete with i18n syntax for all messages, dropdowns, and tooltips.
Adding Blockly.Extensions.buildTooltipForDropdown(..) to facilitate the creation and error-checking of tooltips that update based on the value of a dropdown.
Now warn on raw string in JSON 'extensions'.
* Fixing JSON support for images in dropdowns. Adding tests. (#851)
Fixes #848.
* Update README.md
Add a link to our forum.
* Correcting math_change color
* Enable custom flyout categories.
* Add some safety
* Update the set of reserved words in Python to reflect the current state of Python (2.7 and 3.6). (#861)
* Localisation updates from https://translatewiki.net.
* .getOptions_() to .getOptions() (#869)
Fixes #867.
* Blockly.Extensions.buildTooltipForDropdown(..): Deferred validation. (#870)
Defer tooltip message string check until after load, when all Blockly.Msg should be loaded.
Avoids validation in headless mode, due to lack of document.readyState.
* annotation updates
* annotation updates
* jsdoc corrections (#874)
* Remove use of Array.prototype.includes which is not implemented in IE or Edge < 14. Fixes google/blockly#876.
* Attempt to work around the IE/Edge bug where `getComputedTextLength()` throws an exception when the SVG node is not visible. This workaround forces a re-render, which in turn, forces a re-calculation of the node width once a block is inserted into the workspace SVG. This workaround is only executed on IE and Edge. See https://groups.google.com/forum/#!topic/blockly/T8IR4t4xAIY for the initial discussion of this issue.
* Change CSS transforms to work with older browsers (#879)
* Change the setting of the CSS transform properties on SVG nodes to set both the unprefixed version and the `-webkit-` prefixed version so that Blockly correctly renders in order browsers, such as Safari < 9 and iOS Safari < 9.2. For discussion of this issue, see https://groups.google.com/forum/#!topic/blockly/o3pERaRQhSg
* Correct the separation between the CSS transform property and the rest of the CSS that was in the variable misleadingly called "transform".
* Don't try to get block position in a headless workspace
* Stop bumping neighbours in headless blockly
* Place context menu correctly on touch
* Clear all active desc ids when the 'Erase Workspace' button is pressed.
* Fix a bug where splicing a block between two linked blocks disconnects the group and messes up the focus.
* Deleting a top-level block does not cause blocks after it to be deleted. Properly handle the active desc for this case.
* Localisation updates from https://translatewiki.net.
* Use the empty field placeholder for dropdowns that do not have a value selected.
* Bugfix for #892. I incorrectly converted one CSS transform setting to use the cross-browser setting function in 40a063763c74b3f712c3057565966c25d5cfdb10. (#895)
* Adding @namespace annotations for JSDoc. (#900)
* Fix typo causing TypeError (#901)
* Pinning the angular2 dependency, and including licenses. (#893)
* Add skeleton for tests on rendered workspaces
* Fix some lint errors
* Localisation updates from https://translatewiki.net.
* Correct changedState in setWarningText() (#908)
When clearing warnings on blocks with IDs, the changedState variable should be true if the text changed. This will trigger the block being reshaped and remove the space for the notification icon (this.bumpNeighbours_).
* Adds Block.prototype.mixin() and Blockly.Extensions.registerMixin(). (#907)
Adds Block.prototype.mixin() and Blockly.Extensions.registerMixin().
This adds support for a common use pattern in extensions, and adds
error checking to avoid future incompatibilities.
* Porting Logic blocks to JSON (#913)
Extensions, mixins, mutators and constants now grouped under the new namespace Blockly.Constants.Logic.
* Improving errors/warnings with Block.toDevString() and Connection.toString(). (#911)
* Add isEditable to field, and add tests
* Separate tests
* Blockly.Constants.Math and Blockly.Constants.Colour extension constants (#916)
Also, correcting quotes in logic.js.
* Correction to logic_ternary type check (#920)
* Porting Loop blocks to JSON (#919)
* Improved documentation on `Blockly.Extensions.buildTooltipForDropdown`
* Replaced incorrect uses of `@mixes` JSDoc annotation (on mixin extensions) with `@augments Blockly.Block`.
* Added Blockly.Extensions.buildTooltipWithFieldValue() extension helper.
* Workspace isDraggable
* JSONify simple list blocks
* JSONify variable blocks
* Initial text block, with a mixin to generate quote image fields. (#923)
Text block now uses the extension "text_quotes", supported by Blockly.Constants.Text.QUOTE_IMAGE_MIXIN.quoteField_(fieldName), so that each platform can use the best platform appropriate image (size, density, etc.) for the quotes.
* Add no-op stub .neighbors() for headless Connection.
* Adding tests for logic_ternary block in a new jsunit test framework.
* Correcting output of the logic_null block.
* Potential bug fix for issue #661
* extension controls_if => controls_if_mutator.
* Renamed extension function constant, and moved variables into the mixin.
* Dereference string table references when loading variable fields from JSON.
* Moving FieldImage string dereferencing back into Block.interpolate_() (part of jsonInit()). This sets a clear boundary of where dereferencing should happen.
Towards this, I've added message dereferencing for other field types here, as well. I've used a pattern of field-type specific helper functions.
* Addressing comments.
* .utils.replaceMessageReferences(..) now gracefully returns non-string arguments.
* Clarification update.
Unraveling nested ternaries in Blockly.utils.tokenizeInterpolation_()
* Code correction from previous commit. Moved style to css.js and set ROUNDING=15;
* Fixing Enter so it properly propogates to dropdown selection. (#934)
Fixing FieldSegment so it updates dropdowns when the underlying dropdown changes.
* Localisation updates from https://translatewiki.net.
* Make variable add set/get block in context menu obey block limits
* Localisation updates from https://translatewiki.net.
* Use mutator extension for controls_if block
* Fix #946. Don't check for presence of constants.js
* Fix #945 (annotations) and an eslint issue (constant condition)
* Localisation updates from https://translatewiki.net.
* Fix #950: BlockFactory typo and copypasta
* Add safety checks for mutators and non-mutator extensions
* Handle mutations with both mixins and functions
* Adding warning on duplicate JSON block definition.
* period
* Make some functions private and add tests
* Localisation updates from https://translatewiki.net.
* Update help URL per #937.
Replace URL usages of %28 and %29 with normal parenthesis characters. (They aren't replaced by JavaScript's encodeURIComponent() function, and seem to work just fine without them.)
Added missing semicolon in build.py.
* Typo in comment.
* Make it easier to read the code that creates the variable category in the tolbox
* Adding Blockly.Xml.appendDomToWorkspace() (#962)
This is a copy (with additional comments) of PR #822 (and also #961) by @qnoirhomme with unrelated files removed. See #822 for full review.
* Annotation fixes
* Fix bug #904 by explicitly grabbing focus on the workspace svg element. (#964)
* Potential fix for #888. Stops checking whether we are mid workspace drag since we do not always get mosue up events when blockly is in an iframe. (#899)
* Adding new minimap demo
* Basic code style changes. Adding a few more comments. Return early if disableScrollChange in onScrollChange listener.
* `unction` to `function` corrects #962 (#970)
* Cross browser friendly fix for #904. This calls blur and focus from … (#972)
* Cross browser friendly fix for #904. This calls blur and focus from workspace.markFocused and removes the event listener on focus events. markFocused is called from all of our mouse down handlers, which triggers the focus event leading to an infinite loop of focus. As far as I can tell, there are no uses of the focus handler that actually did anything for us.
* Localisation updates from https://translatewiki.net.
* Another attempt to fix #904 to keep the page from jumping to the focused workspace in IE 11 (#974)
* Adding horizontal scrolling. Changed scroll change callbacks from onScroll_ to setHandlePosition. onScroll_ is not challed when workspace is dragged.
* set background color to lilac if opening the playground from file:
* Registering mousemove and mouseup listener in mousedown event. Mousemove and Mouseup events are now listening over document.
* Localisation updates from https://translatewiki.net.
* Fix #967 by overriding the updateWidth method in FieldImage blocks to be a no-op. FieldImage fields should not change size after the width is set in init. The updateWidth and, therefore, getCachedWidth is now being called by BlockSvg renderFields_ (see commit d55d9cbd9f
). IIUC, updateWidth/getCachedWidth was only called from render before which is overridden in FieldImage to be a no-op already. (#979)
* Fix #969
* Localisation updates from https://translatewiki.net.
* Fix #986. Looks like the original PR just forgot this block. (#992)
* rebuild develop (#996)
* Added the variable modal and component and implemented basic renaming functionality. (#991)
* Fixing commenting from the last commit. (#1000)
* Localisation updates from https://translatewiki.net.
* RemoveAttribute doesn't work on SVG elements in IE 10. Use setAttribute to null instead.
* Adding the remove variable modal and functionality to accessible Blockly. (#1011)
* Minimap position bug fix for browsers other than chrome. Added touch support.
* Adding an add variable modal to accessible Blockly. (#1015)
* Adding the remove variable modal and functionality to accessible Blockly.
* Adding the add variable modal for accessible Blockly.
* Block browser context menu in the toolbox and flyout
* Add links to the dev registration form and contributor guidelines
* Miscellaneous comment cleanup
* Adding the common modal class. (#1017)
Centralizes accessible modal behavior.
* - Changed error message referencing 'procedure' instead of 'function' (#1019)
- Added iOS specific UI messages
- Fixed bug with js_to_json.py script where it didn't recognize ' character
* - Allows use of Blockly's messaging format for category name, colour,… (#1028)
...in toolbox XML.
- Updated code editor demo to use this message format
- Re-built blockly_compressed.js
* Making text_count use a text color (like text_length, which also returns a number). (#1027)
* Enable google/blockly with continuous build on travis ci (#1023) (#1035)
* create .travis for ci job
* initial checkin for blocky-web travis ci job
* rename file to .travis.yaml for typo
* remove after_script
* added cache
* rename .travis.yaml to .travis.yml
* Update .travis.yml
* include build script
* fix yaml file format issue
* debug install part
* debug build issue
* Update .travis.yml
* remove cache for now
* Update .travis.yml
* Update .travis.yml
* Update .travis.yml
* more debug info
* Update .travis.yml
* Update .travis.yml
* fix typo
* installing chrome browser
* remove chrome setting config
* run build.py as part of npm install
* Update .travis.yml
* update karma dependency
* use karma as test runner
* fix typo
* remove karma test for now
* Update .travis.yml
* Update package.json
* add npm test target
* add browserstack-runner depdendency
* update browser support
* fix typo for test target
* fix chrome typo
* added closure dependency
* add google-closure-library
* include blockly_uncompressed.js and core.js dependency
* uncomment out core/*.js files
* add kama job as part of install
* remove browserstack add on for now
* fix karma config typo
* add karma-closure
* add os support
* remove typo config
* include more closure files
* change os back to linux
* use closure-library from node_modules
* change log level back to INFO
* change npm test target to use open browser command instead of karma
* change travis test target to use open command instead of karma
* list current directory
* find what's in current dir
* typo command
* Update .travis.yml
* typo again
* open right index.html
* use right path for index.html
* xdg-open to open default browser on travis
* exit browser after 5s wait
* change timeout to 1 min
* exit after opening up browser
* use browser only
* use karma
* remove un-needed dependency
* clean up script section
* fix typo
* update build status on readme
* initial commit for selenium integration tests
* update selenium jar path
* fix test_runner.js typo
* add more debug info
* check java version
* add && instead of 9288
* fix java path
* add logic to check if selenium is running or not
* add some deugging info
* initial commit to get chromedriver
* add chromedriver flag
* add get_chromedriver.sh to package.json and .travel
* change browser to chrome for now
* fix path issue
* update chromdriver path
* fix path issue again
* more debugging
* add debug msg
* fix typo
* minor fix for getting chromedriver
* install latest chrome browser
* clean up pakcage.json
* use npm target for test run
* remove removing trailing comma
* fix another trailing comma
* updated travis test target
* clean up scripts
* not sure nmp run preinstall
* redirect selenium log to tmp file
* revert writing console log to file
* update test summary
* more clean up
* minor clean up before pull request
* resolved closure-library conflict
1. add closure-library to dependencies instead of devDependencies.
2. add lint back in scripts block
* fix typo (adding comma) in script section
* Renames Blockly.workspaceDragSurface to Blockly.WorkspaceDragSurface.
Fixes #880.
* Ensure useDragSurface is a boolean.
Fixed #988
* use pretest instead of preinstall in package.json (#1043)
* cherry pick for pretest fix
* put pretest target to test_setup.sh
* fix conflict
* cherry pick for get_chromedriver.sh
* add some sleep to wait download to finish
* use node.js stable
* use npm test target
* field_angle renders degree symbol consistently.
Fixes #973
* bumpNeighbours_ function moved to block_svg.
Fixed #1009
* Update RegEx in js-to-json to match windowi eol (#1050)
The current regex only works with the "\n" line endings as it expects no characters after the optional ";" at the end of the line. In windows, if it adds the "\r" it counts as a characters and is not part of the line terminator so it doesn't match.
* Fix French translation of "colour with rgb" block (#1053)
"colorier", which is currently used, is a verb and proposed "couleur" is
a noun: the block in question does not change colour of anything, it
creates new colour instead, thus noun is more applicable.
Also, noun is used in French translation of "random colour" block:
"couleur aléatoire".
* Enforcing non-empty names on value inputs and statement inputs. (#1054)
* Correcting #1054 (#1056)
single quotes. better logic.
* Created a variable model with name, id, and type.
Created a jsunit test file for variable model.
* Change how blockly handles cursors. The old way was quite slow becau… (#1057)
* Change how blockly handles cursors. The old way was quite slow because it changed the stylesheet directly. See issue #981 for more details on implementation and tradeoffs. This changes makes the following high level changes: deprecate Blockly.Css.setCursor, use built in open and closed hand cursor instead of custom .cur files, add css to draggable objects to set the open and closed hand cursors.
* Rebuild blockly_uncompressed to pick up a testing change to make travis happy. Fix a build warning from a multi-line string in the process. (#1059)
* Merge master into develop (#1063)
- pick up translation changes
- clean up trailing spaces
* use goog.string.startswith instead of string.startswith (#1065)
* New jsinterpreter demo includes wait block. Both demos have improved UI for clarity. (#1001)
Refactor of interpreter demo
* Renamed demos/interpreter/index.html as demos/interpreter/step-execution.html (including redirect), and added demos/interpreter/async-execution.html.
* Refactored code to automatically generate/parse the blocks, eliminating the need for a "Parse JavaScript" button. Code is still shown in alert upon stepping to the first statement. Print statements now write to output <textarea> instead of modal dialogs.
* VariableMap and functions added.
* Create separate file for VariableMap and its functions.
* Fix #1069 (#1073)
* VariableMap and functions added.
* Fix #1051 (#1084)
* Improve errors when validating JSON block definitions. (#1086)
goog.asserts to not run from blockly_compressed.js. User data validation should always run.
* 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.
* Tidy up context menu code. (#1081)
* add osx travis test run job (#1074)
* Names are correctly fetched from VariableModels!
* add more wait time for test setup (#1091)
* Work around timing issue with travis osx issue (#1092)
* add more wait time for test setup
* increase selenium wait time
* add more wait
* Fix #1077 by adding a rule to cover the toolbox labels too. (#1099)
* Assign variable UUID to field_variable dropdown.
* Change registration link to a static one (#1106)
This lets us redirect to a different form if we change it in the future.
* Edit generators to read in Variable Models.
* Add VariableMap requirement to workspace.
* Changed parameter name in workspace for clarity.
* Add type, id, and info to the generated xml.
Add xml tests for fieldToDom.
Update workspace tests to pass with new changes.
* Fix apostrophe in tooltips and helpurls (#1111)
* Click events on shadow blocks have the correct id (#1089)
* Add image_onclick option (#1080)
* Cleanup: semicolons, spacing, etc. (#1116)
* Spelling. Spelling is hard.
* Add variable info to xml generated in variables.js
* Add missing CLAs info to the contributing file (#1119)
* Add missing CLAs info to the contributing file
* Added larger changes paragraph
* Replacing latest prettifier hosted in repo with latest version at rawgit CDN. (#1120)
* Forgot update code demo (#1121)
* Move audio code to a new file (#1122)
* move audio code to a new file
* dispose
* null check
* Make flyout get variables from target workspace's variableMap.
* Require VariableModel in field_variable.js.
* Update contributing.md (#1126)
* Include variables at top of serialization.
* Move blockSvg.getHeightWidth to block_render_svg.js (#1118)
* Deserialization variables at top.
* Create grid object (#1131)
* Create grid object
* Doc
* Units! Thanks @RoboErikG
* Add our sound files in other formats
* Remove duplicate merged code
* Remove translation files
* Cleanup duplicate functions
* Add back scrollbar code
* Fix variable related issues
* Revert workspace variable creation change
* Delete language files
* Appease linter
* Remove duplication
* Add spaces to jsdoc line
888 lines
28 KiB
JavaScript
888 lines
28 KiB
JavaScript
/**
|
|
* @license
|
|
* Visual Blocks Editor
|
|
*
|
|
* Copyright 2012 Google Inc.
|
|
* https://developers.google.com/blockly/
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Methods for graphically rendering a block as SVG.
|
|
* @author fraser@google.com (Neil Fraser)
|
|
*/
|
|
'use strict';
|
|
|
|
goog.provide('Blockly.BlockSvg.render');
|
|
|
|
goog.require('Blockly.BlockSvg');
|
|
|
|
|
|
// UI constants for rendering blocks.
|
|
/**
|
|
* Grid unit to pixels conversion
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.GRID_UNIT = 4;
|
|
|
|
/**
|
|
* Horizontal space between elements.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.SEP_SPACE_X = 3 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Vertical space between elements.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.SEP_SPACE_Y = 3 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Vertical space above blocks with statements.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.STATEMENT_BLOCK_SPACE = 3 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Height of user inputs
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_HEIGHT = 8 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Width of user inputs
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_WIDTH = 12 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Editable field padding (left/right of the text).
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.EDITABLE_FIELD_PADDING = 0;
|
|
|
|
/**
|
|
* Minimum width of user inputs during editing
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_WIDTH_MIN_EDIT = 13 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Maximum width of user inputs during editing
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_WIDTH_MAX_EDIT = 24 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Maximum height of user inputs during editing
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_HEIGHT_MAX_EDIT = 10 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Top padding of user inputs
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_TOP_PADDING = 0.25 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Corner radius of number inputs
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.NUMBER_FIELD_CORNER_RADIUS = 4 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Corner radius of text inputs
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.TEXT_FIELD_CORNER_RADIUS = 1 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Default radius for a field, in px.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_DEFAULT_CORNER_RADIUS = 4 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Minimum width of a block.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.MIN_BLOCK_X = 1/2 * 16 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Minimum height of a block.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.MIN_BLOCK_Y = 16 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Width of horizontal puzzle tab.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.TAB_WIDTH = 2 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Rounded corner radius.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.CORNER_RADIUS = 1 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Rounded corner radius.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.HAT_CORNER_RADIUS = 8 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Full height of connector notch including rounded corner.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.NOTCH_HEIGHT = 8 * Blockly.BlockSvg.GRID_UNIT + 2;
|
|
|
|
/**
|
|
* Width of connector notch
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.NOTCH_WIDTH = 2 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* SVG path for drawing next/previous notch from top to bottom.
|
|
* Drawn in pixel units since Bezier control points are off the grid.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.NOTCH_PATH_DOWN =
|
|
'c 0,2 1,3 2,4 ' +
|
|
'l 4,4 ' +
|
|
'c 1,1 2,2 2,4 ' +
|
|
'v 12 ' +
|
|
'c 0,2 -1,3 -2,4 ' +
|
|
'l -4,4 ' +
|
|
'c -1,1 -2,2 -2,4';
|
|
|
|
/**
|
|
* SVG path for drawing next/previous notch from bottom to top.
|
|
* Drawn in pixel units since Bezier control points are off the grid.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.NOTCH_PATH_UP =
|
|
'c 0,-2 1,-3 2,-4 '+
|
|
'l 4,-4 ' +
|
|
'c 1,-1 2,-2 2,-4 ' +
|
|
'v -12 ' +
|
|
'c 0,-2 -1,-3 -2,-4 ' +
|
|
'l -4,-4 ' +
|
|
'c -1,-1 -2,-2 -2,-4';
|
|
|
|
/**
|
|
* Width of rendered image field in px
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.IMAGE_FIELD_WIDTH = 10 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* Height of rendered image field in px
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.IMAGE_FIELD_HEIGHT = 10 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* y-offset of the top of the field shadow block from the bottom of the block.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.FIELD_Y_OFFSET = -2 * Blockly.BlockSvg.GRID_UNIT;
|
|
|
|
/**
|
|
* SVG start point for drawing the top-left corner.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.TOP_LEFT_CORNER_START =
|
|
'm ' + Blockly.BlockSvg.CORNER_RADIUS + ',0';
|
|
|
|
/**
|
|
* SVG path for drawing the rounded top-left corner.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.TOP_LEFT_CORNER =
|
|
'A ' + Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 ' +
|
|
'0,' + Blockly.BlockSvg.CORNER_RADIUS;
|
|
|
|
/**
|
|
* SVG start point for drawing the top-left corner.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.HAT_TOP_LEFT_CORNER_START =
|
|
'm ' + Blockly.BlockSvg.HAT_CORNER_RADIUS + ',0';
|
|
/**
|
|
* SVG path for drawing the rounded top-left corner.
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.HAT_TOP_LEFT_CORNER =
|
|
'A ' + Blockly.BlockSvg.HAT_CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.HAT_CORNER_RADIUS + ' 0 0,0 ' +
|
|
'0,' + Blockly.BlockSvg.HAT_CORNER_RADIUS;
|
|
|
|
/**
|
|
* @type {Object} An object containing computed measurements of this block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.renderingMetrics_ = null;
|
|
|
|
/**
|
|
* Max text display length for a field (per-horizontal/vertical)
|
|
* @const
|
|
*/
|
|
Blockly.BlockSvg.MAX_DISPLAY_LENGTH = 4;
|
|
|
|
/**
|
|
* Point size of text field before animation. Must match size in CSS.
|
|
* See implementation in field_textinput.
|
|
*/
|
|
Blockly.BlockSvg.FIELD_TEXTINPUT_FONTSIZE_INITIAL = 12;
|
|
|
|
/**
|
|
* Point size of text field after animation.
|
|
* See implementation in field_textinput.
|
|
*/
|
|
Blockly.BlockSvg.FIELD_TEXTINPUT_FONTSIZE_FINAL = 14;
|
|
|
|
/**
|
|
* Whether text fields are allowed to expand past their truncated block size.
|
|
* @const{boolean}
|
|
*/
|
|
Blockly.BlockSvg.FIELD_TEXTINPUT_EXPAND_PAST_TRUNCATION = true;
|
|
|
|
/**
|
|
* Whether text fields should animate their positioning.
|
|
* @const{boolean}
|
|
*/
|
|
Blockly.BlockSvg.FIELD_TEXTINPUT_ANIMATE_POSITIONING = true;
|
|
|
|
/**
|
|
* @param {!Object} first An object containing computed measurements of a
|
|
* block.
|
|
* @param {!Object} second Another object containing computed measurements of a
|
|
* block.
|
|
* @return {boolean} Whether the two sets of metrics are equivalent.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.metricsAreEquivalent_ = function(first, second) {
|
|
if (first.statement != second.statement) {
|
|
return false;
|
|
}
|
|
if (first.imageField != second.imageField) {
|
|
return false;
|
|
}
|
|
|
|
if ((first.height != second.height) ||
|
|
(first.width != second.width) ||
|
|
(first.bayHeight != second.bayHeight) ||
|
|
(first.bayWidth != second.bayWidth) ||
|
|
(first.fieldRadius != second.fieldRadius) ||
|
|
(first.startHat != second.startHat)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
};
|
|
|
|
/**
|
|
* Play some UI effects (sound) after a connection has been established.
|
|
*/
|
|
Blockly.BlockSvg.prototype.connectionUiEffect = function() {
|
|
this.workspace.getAudioManager().play('click');
|
|
};
|
|
|
|
/**
|
|
* Change the colour of a block.
|
|
*/
|
|
Blockly.BlockSvg.prototype.updateColour = function() {
|
|
var fillColour = (this.isGlowing_) ? this.getColourSecondary() : this.getColour();
|
|
var strokeColour = this.getColourTertiary();
|
|
|
|
// Render block stroke
|
|
this.svgPath_.setAttribute('stroke', strokeColour);
|
|
|
|
// Render block fill
|
|
var fillColour = (this.isGlowingBlock_) ? this.getColourSecondary() : this.getColour();
|
|
this.svgPath_.setAttribute('fill', fillColour);
|
|
|
|
// Render opacity
|
|
this.svgPath_.setAttribute('fill-opacity', this.getOpacity());
|
|
|
|
// Bump every dropdown to change its colour.
|
|
for (var x = 0, input; input = this.inputList[x]; x++) {
|
|
for (var y = 0, field; field = input.fieldRow[y]; y++) {
|
|
field.setText(null);
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Visual effect to show that if the dragging block is dropped, this block will
|
|
* be replaced. If a shadow block it will disappear. Otherwise it will bump.
|
|
* @param {boolean} add True if highlighting should be added.
|
|
*/
|
|
Blockly.BlockSvg.prototype.highlightForReplacement = function(add) {
|
|
if (add) {
|
|
this.svgPath_.setAttribute('filter', 'url(#blocklyReplacementGlowFilter)');
|
|
Blockly.utils.addClass(/** @type {!Element} */ (this.svgGroup_),
|
|
'blocklyReplaceable');
|
|
} else {
|
|
this.svgPath_.removeAttribute('filter');
|
|
Blockly.utils.removeClass(/** @type {!Element} */ (this.svgGroup_),
|
|
'blocklyReplaceable');
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Returns a bounding box describing the dimensions of this block
|
|
* and any blocks stacked below it.
|
|
* @param {boolean=} opt_ignoreFields True if we should ignore fields in the
|
|
* size calculation, and just give the size of the base block(s).
|
|
* @return {!{height: number, width: number}} Object with height and width properties.
|
|
*/
|
|
Blockly.BlockSvg.prototype.getHeightWidth = function(opt_ignoreFields) {
|
|
var height = this.height;
|
|
var width = this.width;
|
|
// Add the size of the field shadow block.
|
|
if (!opt_ignoreFields && this.getFieldShadowBlock_()) {
|
|
height += Blockly.BlockSvg.FIELD_Y_OFFSET;
|
|
height += Blockly.BlockSvg.FIELD_HEIGHT;
|
|
}
|
|
// Recursively add size of subsequent blocks.
|
|
var nextBlock = this.getNextBlock();
|
|
if (nextBlock) {
|
|
var nextHeightWidth = nextBlock.getHeightWidth(opt_ignoreFields);
|
|
width += nextHeightWidth.width;
|
|
width -= Blockly.BlockSvg.NOTCH_WIDTH; // Exclude width of connected notch.
|
|
height = Math.max(height, nextHeightWidth.height);
|
|
}
|
|
return {height: height, width: width};
|
|
};
|
|
|
|
/**
|
|
* Render the block.
|
|
* Lays out and reflows a block based on its contents and settings.
|
|
* @param {boolean=} opt_bubble If false, just render this block.
|
|
* If true, also render block's parent, grandparent, etc. Defaults to true.
|
|
*/
|
|
Blockly.BlockSvg.prototype.render = function(opt_bubble) {
|
|
Blockly.Field.startCache();
|
|
this.rendered = true;
|
|
|
|
var oldMetrics = this.renderingMetrics_;
|
|
var metrics = this.renderCompute_();
|
|
|
|
// Don't redraw if we don't need to.
|
|
if (oldMetrics &&
|
|
Blockly.BlockSvg.metricsAreEquivalent_(oldMetrics, metrics)) {
|
|
// Skipping the redraw is fine, but we may still have to tighten up our
|
|
// connections with child blocks.
|
|
if (metrics.statement && metrics.statement.connection &&
|
|
metrics.statement.targetConnection) {
|
|
metrics.statement.connection.tighten_();
|
|
}
|
|
if (this.nextConnection && this.nextConnection.targetConnection) {
|
|
this.nextConnection.tighten_();
|
|
}
|
|
} else {
|
|
this.height = metrics.height;
|
|
this.width = metrics.width;
|
|
this.renderDraw_(metrics);
|
|
this.renderClassify_(metrics);
|
|
this.renderingMetrics_ = metrics;
|
|
}
|
|
|
|
if (opt_bubble !== false) {
|
|
// Render all blocks above this one (propagate a reflow).
|
|
var parentBlock = this.getParent();
|
|
if (parentBlock) {
|
|
parentBlock.render(true);
|
|
} else {
|
|
// Top-most block. Fire an event to allow scrollbars to resize.
|
|
Blockly.resizeSvgContents(this.workspace);
|
|
}
|
|
}
|
|
Blockly.Field.stopCache();
|
|
};
|
|
|
|
/**
|
|
* Computes the height and widths for each row and field.
|
|
* @return {!Array.<!Array.<!Object>>} 2D array of objects, each containing
|
|
* position information.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderCompute_ = function() {
|
|
var metrics = {
|
|
statement: null,
|
|
imageField: null,
|
|
iconMenu: null,
|
|
width: 0,
|
|
height: 0,
|
|
bayHeight: 0,
|
|
bayWidth: 0,
|
|
bayNotchAtRight: true,
|
|
fieldRadius: 0,
|
|
startHat: false,
|
|
endCap: false
|
|
};
|
|
|
|
// Does block have a statement?
|
|
for (var i = 0, input; input = this.inputList[i]; i++) {
|
|
if (input.type == Blockly.NEXT_STATEMENT) {
|
|
metrics.statement = input;
|
|
// Compute minimum input size.
|
|
metrics.bayHeight = Blockly.BlockSvg.MIN_BLOCK_Y;
|
|
metrics.bayWidth = Blockly.BlockSvg.MIN_BLOCK_X;
|
|
// Expand input size if there is a connection.
|
|
if (input.connection && input.connection.targetConnection) {
|
|
var linkedBlock = input.connection.targetBlock();
|
|
var bBox = linkedBlock.getHeightWidth(true);
|
|
metrics.bayHeight = Math.max(metrics.bayHeight, bBox.height);
|
|
metrics.bayWidth = Math.max(metrics.bayWidth, bBox.width);
|
|
}
|
|
var linkedBlock = input.connection.targetBlock();
|
|
if (linkedBlock && !linkedBlock.lastConnectionInStack()) {
|
|
metrics.bayNotchAtRight = false;
|
|
} else {
|
|
metrics.bayWidth -= Blockly.BlockSvg.NOTCH_WIDTH;
|
|
}
|
|
}
|
|
|
|
// Find image field, input fields
|
|
for (var j = 0, field; field = input.fieldRow[j]; j++) {
|
|
if (field instanceof Blockly.FieldImage) {
|
|
metrics.imageField = field;
|
|
}
|
|
if (field instanceof Blockly.FieldIconMenu) {
|
|
metrics.iconMenu = field;
|
|
}
|
|
if (field instanceof Blockly.FieldTextInput) {
|
|
metrics.fieldRadius = field.getBorderRadius();
|
|
} else {
|
|
metrics.fieldRadius = Blockly.BlockSvg.FIELD_DEFAULT_CORNER_RADIUS;
|
|
}
|
|
}
|
|
}
|
|
|
|
// Determine whether a block is a start hat or end cap by checking connections.
|
|
if (this.nextConnection && !this.previousConnection) {
|
|
metrics.startHat = true;
|
|
}
|
|
|
|
// End caps have no bay, a previous, no output, and no next.
|
|
if (!this.nextConnection && this.previousConnection &&
|
|
!this.outputConnection && !metrics.statement) {
|
|
metrics.endCap = true;
|
|
}
|
|
|
|
// If this block is an icon menu shadow, attempt to set the parent's
|
|
// ImageField src to the one that represents the current value of the field.
|
|
if (metrics.iconMenu) {
|
|
var currentSrc = metrics.iconMenu.getSrcForValue(metrics.iconMenu.getValue());
|
|
if (currentSrc) {
|
|
metrics.iconMenu.setParentFieldImage(currentSrc);
|
|
}
|
|
}
|
|
|
|
// Always render image field at 40x40 px
|
|
// Normal block sizing
|
|
metrics.width = Blockly.BlockSvg.SEP_SPACE_X * 2 + Blockly.BlockSvg.IMAGE_FIELD_WIDTH;
|
|
metrics.height = Blockly.BlockSvg.SEP_SPACE_Y * 2 + Blockly.BlockSvg.IMAGE_FIELD_HEIGHT;
|
|
|
|
if (this.outputConnection) {
|
|
// Field shadow block
|
|
metrics.height = Blockly.BlockSvg.FIELD_HEIGHT;
|
|
metrics.width = Blockly.BlockSvg.FIELD_WIDTH;
|
|
}
|
|
if (metrics.statement) {
|
|
// Block with statement (e.g., repeat, forever)
|
|
metrics.width += metrics.bayWidth + 4 * Blockly.BlockSvg.CORNER_RADIUS + 2 * Blockly.BlockSvg.GRID_UNIT;
|
|
metrics.height = metrics.bayHeight + Blockly.BlockSvg.STATEMENT_BLOCK_SPACE;
|
|
}
|
|
if (metrics.startHat) {
|
|
// Start hats are 1 unit wider to account for optical effect of curve.
|
|
metrics.width += 1 * Blockly.BlockSvg.GRID_UNIT;
|
|
}
|
|
if (metrics.endCap) {
|
|
// End caps are 1 unit wider to account for optical effect of no notch.
|
|
metrics.width += 1 * Blockly.BlockSvg.GRID_UNIT;
|
|
}
|
|
return metrics;
|
|
};
|
|
|
|
|
|
/**
|
|
* Draw the path of the block.
|
|
* Move the fields to the correct locations.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderDraw_ = function(metrics) {
|
|
// Fetch the block's coordinates on the surface for use in anchoring
|
|
// the connections.
|
|
var connectionsXY = this.getRelativeToSurfaceXY();
|
|
// Assemble the block's path.
|
|
var steps = [];
|
|
|
|
this.renderDrawLeft_(steps, connectionsXY, metrics);
|
|
this.renderDrawBottom_(steps, connectionsXY, metrics);
|
|
this.renderDrawRight_(steps, connectionsXY, metrics);
|
|
this.renderDrawTop_(steps, connectionsXY, metrics);
|
|
|
|
var pathString = steps.join(' ');
|
|
this.svgPath_.setAttribute('d', pathString);
|
|
|
|
if (this.RTL) {
|
|
// Mirror the block's path.
|
|
// This is awesome.
|
|
this.svgPath_.setAttribute('transform', 'scale(-1 1)');
|
|
}
|
|
|
|
// Horizontal blocks have a single Image Field that is specially positioned
|
|
if (metrics.imageField) {
|
|
var imageField = metrics.imageField.getSvgRoot();
|
|
var imageFieldSize = metrics.imageField.getSize();
|
|
// Image field's position is calculated relative to the "end" edge of the
|
|
// block.
|
|
var imageFieldX = metrics.width - imageFieldSize.width -
|
|
Blockly.BlockSvg.SEP_SPACE_X / 1.5;
|
|
var imageFieldY = metrics.height - imageFieldSize.height -
|
|
Blockly.BlockSvg.SEP_SPACE_Y;
|
|
if (metrics.endCap) {
|
|
// End-cap image is offset by a grid unit to account for optical effect of no notch.
|
|
imageFieldX -= Blockly.BlockSvg.GRID_UNIT;
|
|
}
|
|
var imageFieldScale = "scale(1 1)";
|
|
if (this.RTL) {
|
|
// Do we want to mirror the Image Field left-to-right?
|
|
if (metrics.imageField.getFlipRTL()) {
|
|
imageFieldScale = "scale(-1 1)";
|
|
imageFieldX = -metrics.width + imageFieldSize.width +
|
|
Blockly.BlockSvg.SEP_SPACE_X / 1.5;
|
|
} else {
|
|
// If not, don't offset by imageFieldSize.width
|
|
imageFieldX = -metrics.width + Blockly.BlockSvg.SEP_SPACE_X / 1.5;
|
|
}
|
|
}
|
|
if (imageField) {
|
|
// Fields are invisible on insertion marker.
|
|
if (this.isInsertionMarker()) {
|
|
imageField.setAttribute('display', 'none');
|
|
}
|
|
imageField.setAttribute('transform',
|
|
'translate(' + imageFieldX + ',' + imageFieldY + ') ' +
|
|
imageFieldScale);
|
|
}
|
|
}
|
|
|
|
// Position value input
|
|
if (this.getFieldShadowBlock_()) {
|
|
var input = this.getFieldShadowBlock_().getSvgRoot();
|
|
var valueX = (Blockly.BlockSvg.NOTCH_WIDTH +
|
|
(metrics.bayWidth ? 2 * Blockly.BlockSvg.GRID_UNIT +
|
|
Blockly.BlockSvg.NOTCH_WIDTH * 2 : 0) + metrics.bayWidth);
|
|
if (metrics.startHat) {
|
|
// Start hats add some left margin to field for visual balance
|
|
valueX += Blockly.BlockSvg.GRID_UNIT * 2;
|
|
}
|
|
if (this.RTL) {
|
|
valueX = -valueX;
|
|
}
|
|
var valueY = (metrics.height + Blockly.BlockSvg.FIELD_Y_OFFSET);
|
|
var transformation = 'translate(' + valueX + ',' + valueY + ')';
|
|
input.setAttribute('transform', transformation);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Give the block an attribute 'data-shapes' that lists its shape[s], and an
|
|
* attribute 'data-category' with its category.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderClassify_ = function(metrics) {
|
|
var shapes = [];
|
|
|
|
if (this.isShadow_) {
|
|
shapes.push('argument');
|
|
} else {
|
|
if(metrics.statement) {
|
|
shapes.push('c-block');
|
|
}
|
|
if (metrics.startHat) {
|
|
shapes.push('hat'); // c-block+hats are possible (e.x. reprter procedures)
|
|
} else if (!metrics.statement) {
|
|
shapes.push('stack'); //only call it "stack" if it's not a c-block
|
|
}
|
|
if (!this.nextConnection) {
|
|
shapes.push('end');
|
|
}
|
|
}
|
|
|
|
this.svgGroup_.setAttribute('data-shapes', shapes.join(' '));
|
|
|
|
if (this.getCategory()) {
|
|
this.svgGroup_.setAttribute('data-category', this.getCategory());
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Render the left edge of the block.
|
|
* @param {!Array.<string>} steps Path of block outline.
|
|
* @param {!Object} connectionsXY Location of block.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderDrawLeft_ = function(steps, connectionsXY, metrics) {
|
|
// Top edge.
|
|
if (metrics.startHat) {
|
|
// Hat block
|
|
// Position the cursor at the top-left starting point.
|
|
steps.push(Blockly.BlockSvg.HAT_TOP_LEFT_CORNER_START);
|
|
// Top-left rounded corner.
|
|
steps.push(Blockly.BlockSvg.HAT_TOP_LEFT_CORNER);
|
|
} else if (this.previousConnection) {
|
|
// Regular block
|
|
// Position the cursor at the top-left starting point.
|
|
steps.push(Blockly.BlockSvg.TOP_LEFT_CORNER_START);
|
|
// Top-left rounded corner.
|
|
steps.push(Blockly.BlockSvg.TOP_LEFT_CORNER);
|
|
var cursorY = metrics.height - Blockly.BlockSvg.CORNER_RADIUS -
|
|
Blockly.BlockSvg.SEP_SPACE_Y - Blockly.BlockSvg.NOTCH_HEIGHT;
|
|
steps.push('V', cursorY);
|
|
steps.push(Blockly.BlockSvg.NOTCH_PATH_DOWN);
|
|
// Create previous block connection.
|
|
var connectionX = connectionsXY.x;
|
|
var connectionY = connectionsXY.y + metrics.height -
|
|
Blockly.BlockSvg.CORNER_RADIUS * 2;
|
|
this.previousConnection.moveTo(connectionX, connectionY);
|
|
// This connection will be tightened when the parent renders.
|
|
steps.push('V', metrics.height - Blockly.BlockSvg.CORNER_RADIUS);
|
|
} else {
|
|
// Input
|
|
// Position the cursor at the top-left starting point.
|
|
steps.push('m', metrics.fieldRadius + ',0');
|
|
// Top-left rounded corner.
|
|
steps.push(
|
|
'A', metrics.fieldRadius + ',' + metrics.fieldRadius,
|
|
'0', '0,0', '0,' + metrics.fieldRadius);
|
|
steps.push(
|
|
'V', metrics.height - metrics.fieldRadius);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Render the bottom edge of the block.
|
|
* @param {!Array.<string>} steps Path of block outline.
|
|
* @param {!Object} connectionsXY Location of block.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderDrawBottom_ = function(steps,
|
|
connectionsXY, metrics) {
|
|
|
|
if (metrics.startHat) {
|
|
steps.push('a', Blockly.BlockSvg.HAT_CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.HAT_CORNER_RADIUS + ' 0 0,0 ' +
|
|
Blockly.BlockSvg.HAT_CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.HAT_CORNER_RADIUS);
|
|
} else if (this.previousConnection) {
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
} else {
|
|
// Input
|
|
steps.push(
|
|
'a', metrics.fieldRadius + ',' + metrics.fieldRadius,
|
|
'0', '0,0', metrics.fieldRadius + ',' + metrics.fieldRadius);
|
|
}
|
|
|
|
// Has statement
|
|
if (metrics.statement) {
|
|
steps.push('h', 4 * Blockly.BlockSvg.GRID_UNIT);
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',-' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
steps.push('v', -2.5 * Blockly.BlockSvg.GRID_UNIT);
|
|
steps.push(Blockly.BlockSvg.NOTCH_PATH_UP);
|
|
// @todo Why 3?
|
|
steps.push('v', -metrics.bayHeight + (Blockly.BlockSvg.CORNER_RADIUS * 3) +
|
|
Blockly.BlockSvg.NOTCH_HEIGHT + 2 * Blockly.BlockSvg.GRID_UNIT);
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,1 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',-' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
steps.push('h', metrics.bayWidth - (Blockly.BlockSvg.CORNER_RADIUS * 2));
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,1 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
if (metrics.bayNotchAtRight) {
|
|
steps.push('v', metrics.bayHeight - (Blockly.BlockSvg.CORNER_RADIUS * 3) -
|
|
Blockly.BlockSvg.NOTCH_HEIGHT - 2 * Blockly.BlockSvg.GRID_UNIT);
|
|
steps.push(Blockly.BlockSvg.NOTCH_PATH_DOWN);
|
|
}
|
|
steps.push('V', metrics.bayHeight + 2 * Blockly.BlockSvg.GRID_UNIT);
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
|
|
// Create statement connection.
|
|
var connectionX = connectionsXY.x + Blockly.BlockSvg.CORNER_RADIUS * 2 +
|
|
4 * Blockly.BlockSvg.GRID_UNIT;
|
|
if (this.RTL) {
|
|
connectionX = connectionsXY.x - Blockly.BlockSvg.CORNER_RADIUS * 2 -
|
|
4 * Blockly.BlockSvg.GRID_UNIT;
|
|
}
|
|
var connectionY = connectionsXY.y + metrics.height -
|
|
Blockly.BlockSvg.CORNER_RADIUS * 2;
|
|
metrics.statement.connection.moveTo(connectionX, connectionY);
|
|
if (metrics.statement.connection.targetConnection) {
|
|
metrics.statement.connection.tighten_();
|
|
}
|
|
}
|
|
|
|
if (!this.isShadow()) {
|
|
steps.push('H', metrics.width - Blockly.BlockSvg.CORNER_RADIUS);
|
|
} else {
|
|
// input
|
|
steps.push('H', metrics.width - metrics.fieldRadius);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Render the right edge of the block.
|
|
* @param {!Array.<string>} steps Path of block outline.
|
|
* @param {!Object} connectionsXY Location of block.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderDrawRight_ = function(steps, connectionsXY, metrics) {
|
|
if (!this.isShadow()) {
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 ' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',-' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
steps.push('v', -2.5 * Blockly.BlockSvg.GRID_UNIT);
|
|
} else {
|
|
// Input
|
|
steps.push(
|
|
'a', metrics.fieldRadius + ',' + metrics.fieldRadius,
|
|
'0', '0,0', metrics.fieldRadius + ',' + -1 * metrics.fieldRadius);
|
|
steps.push('v', -1 * (metrics.height - metrics.fieldRadius * 2));
|
|
}
|
|
|
|
if (this.nextConnection) {
|
|
steps.push(Blockly.BlockSvg.NOTCH_PATH_UP);
|
|
|
|
// Include width of notch in block width.
|
|
this.width += Blockly.BlockSvg.NOTCH_WIDTH;
|
|
|
|
// Create next block connection.
|
|
var connectionX;
|
|
if (this.RTL) {
|
|
connectionX = connectionsXY.x - metrics.width;
|
|
} else {
|
|
connectionX = connectionsXY.x + metrics.width;
|
|
}
|
|
var connectionY = connectionsXY.y + metrics.height -
|
|
Blockly.BlockSvg.CORNER_RADIUS * 2;
|
|
this.nextConnection.moveTo(connectionX, connectionY);
|
|
if (this.nextConnection.targetConnection) {
|
|
this.nextConnection.tighten_();
|
|
}
|
|
steps.push('V', Blockly.BlockSvg.CORNER_RADIUS);
|
|
} else if (!this.isShadow()) {
|
|
steps.push('V', Blockly.BlockSvg.CORNER_RADIUS);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Render the top edge of the block.
|
|
* @param {!Array.<string>} steps Path of block outline.
|
|
* @param {!Object} connectionsXY Location of block.
|
|
* @param {!Object} metrics An object containing computed measurements of the
|
|
* block.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.renderDrawTop_ = function(steps, connectionsXY, metrics) {
|
|
if (!this.isShadow()) {
|
|
steps.push('a', Blockly.BlockSvg.CORNER_RADIUS + ',' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ' 0 0,0 -' +
|
|
Blockly.BlockSvg.CORNER_RADIUS + ',-' +
|
|
Blockly.BlockSvg.CORNER_RADIUS);
|
|
} else {
|
|
steps.push(
|
|
'a', metrics.fieldRadius + ',' + metrics.fieldRadius,
|
|
'0', '0,0', '-' + metrics.fieldRadius + ',-' + metrics.fieldRadius);
|
|
}
|
|
steps.push('z');
|
|
};
|
|
|
|
/**
|
|
* Get the field shadow block, if this block has one.
|
|
* <p>This is horizontal Scratch-specific, as "fields" are implemented as inputs
|
|
* with shadow blocks, and there is only one per block.
|
|
* @return {Blockly.BlockSvg} The field shadow block, or null if not found.
|
|
* @private
|
|
*/
|
|
Blockly.BlockSvg.prototype.getFieldShadowBlock_ = function() {
|
|
for (var i = 0, child; child = this.childBlocks_[i]; i++) {
|
|
if (child.isShadow()) {
|
|
return child;
|
|
}
|
|
}
|
|
|
|
return null;
|
|
};
|
|
|
|
/**
|
|
* Position an new block correctly, so that it doesn't move the existing block
|
|
* when connected to it.
|
|
* @param {!Blockly.Block} newBlock The block to position - either the first
|
|
* block in a dragged stack or an insertion marker.
|
|
* @param {!Blockly.Connection} newConnection The connection on the new block's
|
|
* stack - either a connection on newBlock, or the last NEXT_STATEMENT
|
|
* connection on the stack if the stack's being dropped before another
|
|
* block.
|
|
* @param {!Blockly.Connection} existingConnection The connection on the
|
|
* existing block, which newBlock should line up with.
|
|
*/
|
|
Blockly.BlockSvg.prototype.positionNewBlock = function(newBlock, newConnection, existingConnection) {
|
|
// We only need to position the new block if it's before the existing one,
|
|
// otherwise its position is set by the previous block.
|
|
if (newConnection.type == Blockly.NEXT_STATEMENT) {
|
|
var dx = existingConnection.x_ - newConnection.x_;
|
|
var dy = existingConnection.y_ - newConnection.y_;
|
|
|
|
// When putting a c-block around another c-block, the outer block must
|
|
// positioned above the inner block, as its connection point will stretch
|
|
// downwards when connected.
|
|
if (newConnection == newBlock.getFirstStatementConnection()) {
|
|
dy -= existingConnection.sourceBlock_.getHeightWidth(true).height -
|
|
Blockly.BlockSvg.MIN_BLOCK_Y;
|
|
}
|
|
|
|
newBlock.moveBy(dx, dy);
|
|
}
|
|
};
|