scratch-blocks/core/input.js

286 lines
8.1 KiB
JavaScript
Raw Permalink Normal View History

/**
* @license
* Visual Blocks Editor
*
* Copyright 2012 Google Inc.
2014-10-07 13:09:55 -07:00
* 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 Object representing an input (value, statement, or dummy).
* @author fraser@google.com (Neil Fraser)
*/
'use strict';
goog.provide('Blockly.Input');
goog.require('Blockly.Connection');
goog.require('Blockly.FieldLabel');
goog.require('goog.asserts');
/**
2013-12-20 16:25:26 -08:00
* Class for an input with an optional field.
* @param {number} type The type of the input.
* @param {string} name Language-neutral identifier which may used to find this
* input again.
* @param {!Blockly.Block} block The block containing this input.
* @param {Blockly.Connection} connection Optional connection for this input.
* @constructor
*/
Blockly.Input = function(type, name, block, connection) {
Merge google/blockly, May 2017 (#881) * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Option for moving one block from stack. See thread in support group before merging. * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Expand stack-drag modifier key to include alt and ctrl. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * Localisation updates from https://translatewiki.net. * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Localisation updates from https://translatewiki.net. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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 d55d9cbd9ff308ff5e361cf77acabb61a4bf4695). 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. * Fix #1069 (#1073) * Fix cursor and mistaken css from merge * Comment out broken field angle merge * Fix broken merge with borders * Add back original package json (woops) * Remove render function for field angle, may not be the right way but it was broken... * Revert merge blocking variable shadow blocks * Add changes from built lang files * Add back travis and readme * Revert broken cleanup additions * Add notes for scratch-block specific functions * Revert change to css so blocks stay under the toolbox * Add back accidentally removed files * Use getFlyout_ instead of getFlyout everywhere * Satisfy the linter * Re-remove deprecated function * Remove duplicated code in block_svg * Add back flip_rtl option for images * Remove more duplicated functions from past merges * Fix flip_rtl code * Revert renaming of getFlyout
2017-05-11 15:58:18 -04:00
if (type != Blockly.DUMMY_INPUT && !name) {
throw 'Value inputs and statement inputs must have non-empty name.';
Merge google/blockly, May 2017 (#881) * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Option for moving one block from stack. See thread in support group before merging. * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Expand stack-drag modifier key to include alt and ctrl. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * Localisation updates from https://translatewiki.net. * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Localisation updates from https://translatewiki.net. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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 d55d9cbd9ff308ff5e361cf77acabb61a4bf4695). 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. * Fix #1069 (#1073) * Fix cursor and mistaken css from merge * Comment out broken field angle merge * Fix broken merge with borders * Add back original package json (woops) * Remove render function for field angle, may not be the right way but it was broken... * Revert merge blocking variable shadow blocks * Add changes from built lang files * Add back travis and readme * Revert broken cleanup additions * Add notes for scratch-block specific functions * Revert change to css so blocks stay under the toolbox * Add back accidentally removed files * Use getFlyout_ instead of getFlyout everywhere * Satisfy the linter * Re-remove deprecated function * Remove duplicated code in block_svg * Add back flip_rtl option for images * Remove more duplicated functions from past merges * Fix flip_rtl code * Revert renaming of getFlyout
2017-05-11 15:58:18 -04:00
}
/** @type {number} */
this.type = type;
/** @type {string} */
this.name = name;
2016-05-04 15:05:45 -07:00
/**
* @type {!Blockly.Block}
* @private
*/
this.sourceBlock_ = block;
/** @type {Blockly.Connection} */
this.connection = connection;
/** @type {!Array.<!Blockly.Field>} */
2013-12-20 16:25:26 -08:00
this.fieldRow = [];
/**
* The shape that is displayed when this input is rendered but not filled.
* @type {SVGElement}
* @package
*/
this.outlinePath = null;
};
/**
* Alignment of input's fields (left, right or centre).
* @type {number}
*/
Blockly.Input.prototype.align = Blockly.ALIGN_LEFT;
/**
* Is the input visible?
* @type {boolean}
* @private
*/
Blockly.Input.prototype.visible_ = true;
/**
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
* Add a field (or label from string), and all prefix and suffix fields, to the
* end of the input's field row.
2013-12-20 16:25:26 -08:00
* @param {string|!Blockly.Field} field Something to add as a field.
2015-07-13 15:03:22 -07:00
* @param {string=} opt_name Language-neutral identifier which may used to find
2013-12-20 16:25:26 -08:00
* this field again. Should be unique to the host block.
* @return {!Blockly.Input} The input being append to (to allow chaining).
*/
2013-12-20 16:25:26 -08:00
Blockly.Input.prototype.appendField = function(field, opt_name) {
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
this.insertFieldAt(this.fieldRow.length, field, opt_name);
return this;
};
/**
* Inserts a field (or label from string), and all prefix and suffix fields, at
* the location of the input's field row.
* @param {number} index The index at which to insert field.
* @param {string|!Blockly.Field} field Something to add as a field.
* @param {string=} opt_name Language-neutral identifier which may used to find
* this field again. Should be unique to the host block.
* @return {number} The index following the last inserted field.
*/
Blockly.Input.prototype.insertFieldAt = function(index, field, opt_name) {
if (index < 0 || index > this.fieldRow.length) {
throw new Error('index ' + index + ' out of bounds.');
}
2013-12-20 16:25:26 -08:00
// Empty string, Null or undefined generates no field, unless field is named.
if (!field && !opt_name) {
return this;
}
2013-12-20 16:25:26 -08:00
// Generate a FieldLabel when given a plain text field.
if (goog.isString(field)) {
2013-12-20 16:25:26 -08:00
field = new Blockly.FieldLabel(/** @type {string} */ (field));
}
field.setSourceBlock(this.sourceBlock_);
2014-12-23 11:22:02 -08:00
if (this.sourceBlock_.rendered) {
field.init();
}
2013-12-20 16:25:26 -08:00
field.name = opt_name;
2013-12-20 16:25:26 -08:00
if (field.prefixField) {
// Add any prefix.
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
index = this.insertFieldAt(index, field.prefixField);
}
2013-12-20 16:25:26 -08:00
// Add the field to the field row.
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
this.fieldRow.splice(index, 0, field);
++index;
2013-12-20 16:25:26 -08:00
if (field.suffixField) {
// Add any suffix.
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
index = this.insertFieldAt(index, field.suffixField);
}
if (this.sourceBlock_.rendered) {
this.sourceBlock_.render();
2013-12-20 16:25:26 -08:00
// Adding a field will cause the block to change shape.
this.sourceBlock_.bumpNeighbours_();
}
Feature/merge feb 2017 (#791) * Revert "Rebuild nov 3 16" * Move injected css to start of head * simplification * lint * Remove copy/paste buttons. * Localisation updates from https://translatewiki.net. * Don't split dropdown text if there is an image. * Unblock push to master. * Revert "Revert "Rebuild nov 3 16"" This reverts commit c8ca24a0007b70e137417e843459c87185141a55. * rebuild * Remove ifelse block and messages' * Remove obsolete Gecko image hack. Apparently this has been fixed in Gecko. * Add correct focus behavior for the modal. Update boundary sounds. * Disallow clicks on disabled buttons. * add back metadata tag to qqq * revert qqq.json * Improve performance of block dragging. This is a backport of the blo… (#732) Improve performance of block dragging. This is a backport of the block drag surface from scratch-blocks. At the beginning of a block drag, blocks get moved to a drag surface which then translates using translate3d to avoid repainting the entire svg on every mouse move. At the end of the drag, the blocks are dropped back in the svg in their new position. * API-breaking cleanup. But doubtful anyone will be affected. (#748) * Make add/removeClass return whether they did anything. * Move more functions onto utils. * Move bind functions to Blockly. * Routine recompile. * String reference in JSON string messages (#741) * Adds message references to message string interpolation, in the form of %{BKY_STRING}. * Re-adding CONTROLS_IFELSE block using the new syntax, referencing to CONTROL_IF equivalents. * Fix compiler errors. * Break the sidebar out into its own individual component. * Hide notification messages after a short time interval. * Fix selection border on blocks that have been highlighted. * controls_ifelse: Remove right-align. Remove Boolean check on statements. (#749) * Move away from using a common modal service, since the block options and the toolbox modals are going to end up behaving fairly differently. * Fix conflict between 'utils' and 'image dropdown' merges. * Add a contextual modal for the toolbox. * Fix some bugs arising in the toolbox modal for the no-categories case. * Allow attaching blocks to a marked spot from the toolbox modal. This is the last prerequisite for removal of the existing on-screen toolbox. * Delete the on-screen toolbox. * Add warning sounds when the user reaches a boundary of the workspace. * Stop some blocks from throwing errors in headless workspaces. * Lint * Fix speling. * Fix broken highlighting when highlighted block is deleted. Issue 752. * When the workspace is empty, make it easy for the user to add a new group of blocks to it. * Handle the finer points for setting focus correctly after deleting blocks from the workspace. * When user edits text in a field, set text, not value. Existing text-editable fields don’t care (dropdown care, but are not text-editable). But a note picker needs to set its value to 60 if text is set to ‘C4’. * Set the text not the value when closing a text editor. Also rename variables for clarity. * Localisation updates from https://translatewiki.net. * Streamline the logic for block selection callbacks in the toolbox modal. * Do not show disabled actions in the block options modal. * Set focus correctly when toolbox modal is dismissed. * Add information regarding target screen reader and browser. * Rebuild Blockly. * Remove unavailable blocks from toolbox modal. Hide unnecessary category name in a toolbox without categories. * Do some refactoring and tidy-up. Pull some hardcoded strings out for i18n purposes; remove unused strings. * Update config options for sidebar buttons. * Minor refactoring. Remove unused dependencies. * Improve styling of sidebar buttons. * Remove clipboard functionality. * Refactor and simplify marked spot logic. * Change dropdowns to select fields instead of lists of buttons. * Add ability to specify a css class for labels and buttons * Don't make labels clickable * console.log -> console.warn * change 'class' to 'web-style' * createSvgElement is now in utils. fix two calls. * Improve comments. * lint * fix missing semicolon * When adding a new block group from the toolbox modal, only show blocks with no output connections. * Clean up the sidebar file and remove unneeded code. * Remove some functions from utilsService and consolidate code in workspace-tree.component.js. * Standardize indentation. * Remove premature focus on buttons in modal dialogs, since this prevents readout of the dialog text. * Localisation updates from https://translatewiki.net. * Don't get Toolbox element unless needed. * Associate flyout button callbacks directly with workspaces * Add colour block to the block factory base block initial state * Start getting helpurl and tooltip in * Generate helpURL and tooltip for Javascript block definition * Use Tab keys instead of arrow keys for dialog boxes. Set role=alertdialog and read out the header/text automatically. Ensure that Esc key actually closes dialogs and that all keystrokes are captured. * Add an aria-describedby to the 'create new block group...' button in the workspace to give more context. * Fix issue with aria-liveregion not speaking. Allow sufficient time for alert noise to play before speaking the notification. * Make zoom speed independent of event granularity Before, touchpads would give "smoother" scrolling by delivering lots of mousewheel events with small distance changes. Because the code only looked at the sign of deltaY, ten 5px scrolls would zoom 10x more than one 50px scroll. This change makes zooming with a touchpad more like zooming with a mousewheel. On my laptop, a full-scale zoom (fully out to fully in) was about a 5mm finger movement before, and is now about 3cm. Fixes #758. * Split the scrollbar and flyout out into their own SVG elements. They (#771) * Split the scrollbar and flyout out into their own SVG elements. They are siblings of the workpsace SVG. This paves the way to make performance improvements to workspace dragging. * remove overflow-y on the block exporter labels so scroll bars do not show upin firefox. Also fix up the styles on the labels so that they display better in firefox. (#699) * Fix #698 by adjusting the regex to not have \. Still not 100% sure w… (#700) * Fix #698 by adjusting the regex to not have \. Still not 100% sure why that was there. Also replaces bad names on input. There are probably more invalid names but this is a start. * update generator comments * Move the call to disable resize before placeNewBlock so that it is of… (#777) * Move the call to disable resize before placeNewBlock so that it is off when workspace resizeContents gets triggered by placeNewBlock. This fixes a bug in rtl mode where the workspace was being resized between when the block was added to the workspace and when it was moved to the proper location. * Disable workspace resizing while loading the flyout from XML * Localisation updates from https://translatewiki.net. * Add a workspace drag surface that blocks and bubble get moved to duri… (#778) * Add a workspace drag surface that blocks and bubble get moved to during a workspace drag. The surface is translated using translate3d instead of svg's translate attribute so that the browser does not have to repaint the entire workspace on every mouse move. This is very similar to the block drag surface. * Address code review comments * add back hasClass_ utility removed in #748 and stop using contains since it is not supported in IE * Fixes #786 by checking if getComputedStyle is null in is3dSupported. We do not cache the value in this case and try again later. is3dSupported is only called while users are interacting with blockly which they cannot do while hidden so the performance implications of running the check again are minimal. (#787) * Localisation updates from https://translatewiki.net. * Change the Python codegen for string quoting to match the behaviour of `repr` on a string in CPython. * Localisation updates from https://translatewiki.net. * Add an `allInputsConnected` method to `Block` and `Workspace` to test whether all trees in the block forest have their inputs filled. An optional argument controls whether or not shadow blocks are counted as being filled. Recommitting changes off `develop` instead of `master` as per discussion in PR #791. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Use the drag surface when scrolling using the scrollbars. #783 (#789) * End event groups when you finish editing a field * Fix #794 and make the workspace grid drag along with the workspace. (#801) There was some IE specific code that also applies to Edge so just updated a conditional to include Edge. * Now that text input's setText skips setValue, it needs to explicitly create a change event * Check if the text has changed before firing an event * Init procedure blocks with empty name, and set default name in xml in Blockly.Procedures.flyoutCategory * Routine rebuild * Move createDom call into the constructor of block drag surface. (#790) * Make cursor stay as a closed hand when dragging blocks around in the drag surface. Do this by applying the same style to text elements in the drag surface that we do in the main svg. (#805) * Don't connect to blocks under the flyout. * recompile again. (#806) * Fix german translation * Fix german translation of 'delete x blocks' * Adding unit tests for ifelse block. * Improvements to the generator test framework. * <field>, <value> reorder due to load/save. * Use the npm closure library instead of the same library installed at a parallel directory * Fix undo/redo for FieldCheckbox Thanks to PR #813 by ademenev * PR #818: Adding support for string table lookups in dropdown field labels Adding support for string table lookups in dropdown field labels specified in JSON. Adds Blockly.utils.replaceMessageReferences() method to handle string replacement without interpolation tokens. Effectively uses the same old code, now moved into tokenizeInterpolation_(), which takes a parseInterpolationTokens option. Replaces the direct JavaScript references (not pure JSON, and thus not portable). Demonstrating this behavior in the logic_boolean dropdown. * Integrating qqq.json changes into messages.json. (#820) From commits b77f8cbebc5cef247116d3df6a428df8addbe53d and 4ecdedec9f8a69f78abf246e7a5db1e1a0be6b85 * Naming changes in mirror demo * Adding support for untranslated messages. (#819) This will be used to define constants accessible in JSON block definitions. Messages with descriptions that include `{{Notranslate}}` will not be included in the translation files sent to TranslateWiki. Instead, they are written to `msg/json/constants.json`, and later merged back into the `.js` files, similar to synonyms. Template details: https://translatewiki.net/wiki/Template:Notranslate * JSON support for message lookup in colour, tooltip, and help URL. (#825) String replacement for the colour, tooltip text and help URL attributes of JSON defined blocks. Demonstrated in logic_boolean. * Fixes as per code review on PR. * Reduce number of Closure files in App Engine upload. * Python false is False. Issue #828. * Replace 'const' with 'var'. This unbreaks IE10 and advanced compiled apps such as Blockly Games. * Fix bug in audioService where attached event callbacks were not being cleared properly. * Rename workspace-tree to workspace-block. * Minor refactoring of the modal code (add comments, guard against invalid keystrokes, etc.). * FieldNumber & FieldAngle: Default value "0" (#832) FieldNumber and FieldAngle previously accepted "undefined" as values, if not defined in JSON. This catches these and uses "0" for any NaN value. The constructor value parameter is now optional. Includes tests. * Remove unnecessary check when attaching a new block to a marked connection. * Remove debug info. * Refactor and simplify field-segment.component.js. * Replace single quotes with double. (#836) Fixes commits in #832. * Adding extensions for JSON support of dynamic blocks. (#834) Adding support for extensions, functions that can assist with loading blocks, much like init functions, but that can be referenced from JSON definitions. This allows JSON definitions to define dynamic blocks such as onchange handlers and mutators. Rewrote math_number as an example pure JSON block. * Add ability to add a class to a scrollbar so that different types of … (#837) * Add ability to add a class to a scrollbar so that different types of scrollbars can be distinguished from each other. You used to be able to do this by looking at the parent element but now all the scrollbars are siblings in the dom. Also, use this new class to fix #816 so that layering of the flyout and workspace scrollbars are done correctly. * 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. * Add a block to reverse a list (#844) * 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) * .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 * 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. * 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 * 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. * 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. * Fix a few small errors and rebuild * Call dynamic toolbox generators correctly * cleanup * Fix unit tests, and delete a few that relied on completely undefined behaviour * Fix RTL text inputs * eslintignore more tests * Fix insertion marker highlighting, I think * Make getFlyout public
2017-02-21 12:09:23 -08:00
return index;
};
2013-12-20 16:25:26 -08:00
/**
* Remove a field from this input.
* @param {string} name The name of the field.
* @throws {goog.asserts.AssertionError} if the field is not present.
*/
2013-12-20 16:25:26 -08:00
Blockly.Input.prototype.removeField = function(name) {
for (var i = 0, field; field = this.fieldRow[i]; i++) {
if (field.name === name) {
field.dispose();
this.fieldRow.splice(i, 1);
if (this.sourceBlock_.rendered) {
this.sourceBlock_.render();
2013-12-20 16:25:26 -08:00
// Removing a field will cause the block to change shape.
this.sourceBlock_.bumpNeighbours_();
}
return;
}
}
goog.asserts.fail('Field "%s" not found.', name);
};
/**
* Gets whether this input is visible or not.
* @return {boolean} True if visible.
*/
Blockly.Input.prototype.isVisible = function() {
return this.visible_;
};
/**
* Sets whether this input is visible or not.
2015-02-27 16:11:04 -08:00
* Used to collapse/uncollapse a block.
* @param {boolean} visible True if visible.
* @return {!Array.<!Blockly.Block>} List of blocks to render.
*/
Blockly.Input.prototype.setVisible = function(visible) {
var renderList = [];
if (this.visible_ == visible) {
return renderList;
}
this.visible_ = visible;
var display = visible ? 'block' : 'none';
2013-12-20 16:25:26 -08:00
for (var y = 0, field; field = this.fieldRow[y]; y++) {
field.setVisible(visible);
}
if (this.connection) {
// Has a connection.
if (visible) {
renderList = this.connection.unhideAll();
} else {
2014-09-08 14:26:52 -07:00
this.connection.hideAll();
}
var child = this.connection.targetBlock();
if (child) {
2014-12-23 11:22:02 -08:00
child.getSvgRoot().style.display = display;
if (!visible) {
child.rendered = false;
}
}
}
return renderList;
};
/**
* Change a connection's compatibility.
* @param {string|Array.<string>|null} check Compatible value type or
* list of value types. Null if all types are compatible.
* @return {!Blockly.Input} The input being modified (to allow chaining).
*/
Blockly.Input.prototype.setCheck = function(check) {
if (!this.connection) {
throw 'This input does not have a connection.';
}
this.connection.setCheck(check);
return this;
};
/**
2013-12-20 16:25:26 -08:00
* Change the alignment of the connection's field(s).
* @param {number} align One of Blockly.ALIGN_LEFT, ALIGN_CENTRE, ALIGN_RIGHT.
* In RTL mode directions are reversed, and ALIGN_RIGHT aligns to the left.
* @return {!Blockly.Input} The input being modified (to allow chaining).
*/
Blockly.Input.prototype.setAlign = function(align) {
this.align = align;
if (this.sourceBlock_.rendered) {
this.sourceBlock_.render();
}
return this;
};
/**
2013-12-20 16:25:26 -08:00
* Initialize the fields on this input.
*/
Blockly.Input.prototype.init = function() {
if (!this.sourceBlock_.workspace.rendered) {
return; // Headless blocks don't need fields initialized.
}
Adding indexing settings, tests and fixing bugs (#464) * Add indexing setting for JavaScript Generation Adding setting to allow for switching between zero and one based indexing for Blockly Blocks such that the generated code will use this flag to determine whether one based or zero based indexing should be used. One based indexing is enabled by default. * Updating js lists to do zero and one based index Updated generated JavaScript to change depending on whether one based indexing is enabled or not. * Updating js text to do zero and one based index Change so that JavaScript generated for text blocks either assumes blocks use zero or one based index based on setting. * Start of python indexing Start of work on allowing one and zero indexing for generated python for lists. * Fixing bug and lint fixed Fixing bug caused by not setting the return of concat when concatenating lines for sublist and substring functions. Also renamed these functions to be getSubsequece. Fixed lint errors with spacing * Converting from if to switch statements Comverting if statements to switch statements when appropriate and adding spacing. * Modified sublist JavaScript generation Added case so that helper function is not generated if not necessary. Helper function is not generated if list length is not needed or if list is a simple block (such as a variable, as oppossed to a function call or list create). * Stripping unecessary ids Removing ids from xml file. * Localisation updates from https://translatewiki.net. * Fix typo in flyout.js (#403) * Fix typo in flyout.js (#402) * Localisation updates from https://translatewiki.net. * Add indexing setting for JavaScript Generation Adding setting to allow for switching between zero and one based indexing for Blockly Blocks such that the generated code will use this flag to determine whether one based or zero based indexing should be used. One based indexing is enabled by default. * Updating js lists to do zero and one based index Updated generated JavaScript to change depending on whether one based indexing is enabled or not. * Updating js text to do zero and one based index Change so that JavaScript generated for text blocks either assumes blocks use zero or one based index based on setting. * Fixing bug and lint fixed Fixing bug caused by not setting the return of concat when concatenating lines for sublist and substring functions. Also renamed these functions to be getSubsequece. Fixed lint errors with spacing * Converting from if to switch statements Comverting if statements to switch statements when appropriate and adding spacing. * Modified sublist JavaScript generation Added case so that helper function is not generated if not necessary. Helper function is not generated if list length is not needed or if list is a simple block (such as a variable, as oppossed to a function call or list create). * Stripping unecessary ids Removing ids from xml file. * Updating generator test Modifying sublist test and re-formatting spacing between blocks. * Updating js lists to do zero and one based index Updated generated JavaScript to change depending on whether one based indexing is enabled or not. * Updating js text to do zero and one based index Change so that JavaScript generated for text blocks either assumes blocks use zero or one based index based on setting. * Fixing bug and lint fixed Fixing bug caused by not setting the return of concat when concatenating lines for sublist and substring functions. Also renamed these functions to be getSubsequece. Fixed lint errors with spacing * Converting from if to switch statements Comverting if statements to switch statements when appropriate and adding spacing. * Modified sublist JavaScript generation Added case so that helper function is not generated if not necessary. Helper function is not generated if list length is not needed or if list is a simple block (such as a variable, as oppossed to a function call or list create). * Stripping unecessary ids Removing ids from xml file. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Updating js lists to do zero and one based index Updated generated JavaScript to change depending on whether one based indexing is enabled or not. * Fixing bug and lint fixed Fixing bug caused by not setting the return of concat when concatenating lines for sublist and substring functions. Also renamed these functions to be getSubsequece. Fixed lint errors with spacing * Modified sublist JavaScript generation Added case so that helper function is not generated if not necessary. Helper function is not generated if list length is not needed or if list is a simple block (such as a variable, as oppossed to a function call or list create). * Stripping unecessary ids Removing ids from xml file. * Updating generator test Modifying sublist test and re-formatting spacing between blocks. * Adding tests for indexing and extra cases Adding tests for indexing with custom block to adjust number based on what indexing is being generated. * Adding tests and renaming tests Adding tests for sublist and renaming tests. * Fixes for order for sublists Fixes so that parenthesis are generated properly for index for sublist * Cleaning up test generated code Changing order returned for unit test adjust index function to generate less unecessary parenthesis. * Adding tests for order Adding tests for order, relevant for methods that use index from start (because 1 is added) * Fixing JS order for getIndex and setIndex Changing to the correct order type when calling valueToCode in JS generation for getIndex and setIndex. * Fixed unittest adjustIndex Fixed uninttest adjustindex to also check whether the ONE_BASED_INDEXING variable has been defined to ensure proper behaviour. * Fixing lint and formatting for JS/lists Making line fixes and changing an if/elseif to case statement. * Tests added to include case for bug found Added tests with sublist combinations of different where's for the two indices after bug for this found in python. * Adding and renaming tests Adding test case for creating a sublist that encompasses the whole list but uses # and #-end instead of first last (applicable for python). Also, renaming tests. * Adding contant and fixing python lists bugs Adding contant for ONE_BASED_INDEXING and fixing bugs in python for lists. * Fixing test get random Fixing test get random to take into account indexing for return value. * Adding indexing checkbox to test page Adding checkbos on test page so that code can be generated for one and zero based indexing. Languages that are generated with zero based indexing that do not have it implemented will fail tests as expected. * Fixing unittest getremove random Fixing unittest getremove random to take into account the return value based on indexing. * Change comparison for getremove random test Fixed comparison to equal for the return value for getremove random. * Fixing bugs with lists zero-indexing Fixing getIndex and getSublist methods to pass for zero-indexed tests. * Adding test cases and formatting Adding test cases to text tests, reordering a couple list test, and formatting block spacing. * Fixing unittest expected value Fixing expected value fore unit tests for sublist. * Cleanup Removing obvious comments, formatting fixes, and naming in generated code in JS. * Helper function for Python lists Adding helper function for casting to int for indices. * Expanding helper to reduce duplicated code Expanding helper method to also get the property with the correct order and check indexing to reduce duplicated code. * Cleaning up JS indexing with helper function Adding helper function for indexing and used it in lists and text. * Moving helper function and formatting fixes Moving helper function, formatting fixes, and changing some generated code variable names. * Fixing python generation for text Fixing all failinng tests for python and using new helper method. * Lint fixes and order in indexOf Making lint fixes and correcting returned order in indexOf. * Python variable renaming Renaming a few generated variables. * Fixing comment and order Fixing comment to list Blockly.Block type and fixing order because it could be higher. * Switching back to if Switching switch back to if statements because there weren't enough cases to warrant for a switch. * Adding order and fixing lists for Dart Adding if null operator to operator precedence for Dart. Also, fixing lists implementation to pass unit tests and adding zero-indexing functionality. * Formatting and lint fixes Formatting and lint fixes * Dart text fixed Fixing Dart text generation to pass unit tests. * Changing back to variable Changing switch condition back to variable. * Fixing ORDER_OVERRIDES Inner and outer order was switched . * Adding bug with order caused by generator change Flooring order before comparision because of how the order constants were modified. * Adding list tests Adding tests for additional cases for lists/ * Adding comment for dart order Adding comment for Dart ORDER_IF_NULL operator. * Formatting fixes Formatting fixes for line indentation. * Fixing PHP order and lists generation Fixing PHP order constants and fixing lists so that they pass unit tests. * Fixing tests Removing duplicate unit test * Adding text tests Adding tests for text. * Renaming variable and removing unused variable Renaming variables from exceptionIndex to errorIndex and removing unused at variable. * Adding missing function call to test Adding missing funciton call to test that was causing tests to fail when they shouldn't. * Fixing PHP text generation Fixing PHP text code generation so it passes unit tests. * Formatting fixes Cleaning up code, renamiing a variable. * Fixing failing subsequence tests Fixing JS code that failed for sublist/substring tests. * Fixing intentation Fixing indentation. * Fixing Dart sublist/substring Fixing sublist/substring to include condiiton where FROM_START (and not throw error by mistake) when zero-indexed. * Adding order subtraction test Adding test for checking order for subtraction x- (y - z) x - (y + z). * Updating to new PHP power operator Updating from pow function to ** operator to clean up code. * Updating to new removeWhere Updating removeMatching to removeWhere because new version of Dart now use removeWhere. * Fix for lua rounding assertequals Adding check for number in equlity check for comparing number for floats. * Adding test for copy of list Adding test that checks the list is copied when a sublist is made first-last. * Formatting and order fixes Fixing formatting such as indentation and order fixes. * Adding comment for clarity Adding comment about how Lua code generation is not supporting zero indexing. * Changed variable names in code Changed variable names to follow style guide and changed for loop variable from n to i as is typical. * Reducing unecessarily generated functions and renaming variables Reducing number of generated functions using gensym_ by adding parameters to provided function. Renaming variables to make functions more readble. * Fixing sublist order and sort variable Fixing order used for valueToCode for sublist and renaming list variable in sort to match rest of code.. * Fixing order constant order Removing operator () that was incorrect and addiung ~, * Fixing order and indentation Fixing order return fro create lists blocks and fixing indentationn for string array. * Fixing order and renaming variables Fixing order to be the correct strength and renaming variables to be more readable/ * Changing assert blocks for unit tests Changing assert blocks to have a value input instead of a field so there is more flexibility in writing tests. * Cleaning up and adding missing order tests Adding tests for order for paramters for list blocks that weren't being tested to uncover bugs. Test were also cleaned up/reorganized/renamed to be more readable and shorter vertically (but lines wider horizontally). * Compile error fix and order in Dart generation. Fixing compile error in generated code and incorrect order in get sublist for Dart. * Fixing typo in getIndex and invalid parameter name Fixing type in getIndex where list code should have been appended but instead an undefined variable was added. The parameter in lists_sort was changed to my_list because list is a reserved word in python. * Fixing order, parenthesis bug, and variable declaration in Lua Fixing incorrect order in Lua. Fixing bug caused by missing parenthesis around ternary operator in code. Variable code was declared with JavaScript syntax, this was fixed to be valid in Lua. * Adding tests and formatting tests Adding missing test for order in text/lists. Changing spacing/order of tests and updating comments. * Fixing error in code Changing to correct function call in empy tests and changing test name that was duplicated to be more clear. * Renamed test helper function * Fixing order and renaming variable in JS generator Fixing order for charAt and renaming variable in code list_sort from listCode to list to be consistent with rest of code. * Fixing order for dart text Fixing roder for dart charAt * Cleaning up generated code for Dart getIndex Cleaning up generated code for Dart getIndex so that helper functions aren't generated unecessarily and adding comments. * Fixing Dart remove random error Fixing error caused by remove random implementation in Dart. index should have been x but instead was length - x. * Fixing unit test blocks Fixing Lua unit test block that should have just returned the number and removing unecessary checks in other blocks because the constant was defined. * Fixing Lua assert equals block string.format was throwing an error if one of the values happened to be a boolean. * Adding tests for create text with number Adding test for create text with numbers as parameters * Fixing lua unit test block Lua unit test block should have added 1 * Removing indexing setting for Lua tests Removing setting index setting for Lua generation because it is always one-indexed. * Fixing order and create text Fixing failing test caused by improper order and fixed create text to properly convert to string when there is one element. * Running linter on generator code Running linter on generator code and fixing spacing/indentation problems. * Editing comments and removing uneeded parenthesis Editing and adding comments and removing uneeded parenthesis around ternary operator condition. * Fixing order and changing variable names Fixing orders that were incorrect and changing variable names to be more descriptive and consistent across code. * Adding comment about list support and fixes for PHP Adding comment about how lists are not fully supported for PHP. Adding missing order to PHP and fixing order errors throughout. Fixing regex for variable matching in lists. Cleaning up variable names to be more readable and consistent with other parts of code. * Reducing complexity for getremove/remove in JS Reducing complexity in generated code for getremove/remove in JavaScript by replacing unecessary helper function. * Fixing spacing before inline comments Ensuring there are two spaces before inline comments. * Changing JS list copy for clarity Changing JavaScript list copy to use slice(0) instead of concat for clarity and to use the same pattern as the other sublist methods. * Changing generated variable name tmp_x Changing tmp_x to tmpX to follow closer to the correct style for JavaScript. * Prefixing empy lines between comment text Prior to this change, comments with an empty line between text did not have a comment prefix before it, resulting in comment blocks that seemed disjoined although they were for the same block. This change affects how the prefix line function works so that those lines will have the prefix (if applicable) while still taking into account the trailing newline character. * Changing for loops variable names Changing most for loops to use i as the variable name (or j if applicable) or changing name to be more readable. * Simplifying provided subsequence function Simplifying subsequence function to generate a simpler function depending on where combination instead of a larger complex function that works for all where combinations. * Style fixes Fixing indentation, comments, and other formatting-type changes based on pull request comments. * Fixing indentation Fixing indentation and removing an extra newline. * Fixing PHP mode implementation Fixing PHP mode implementation to properlyu return multiple modes if applicable. * Fixing line too long Wrapping lines in php/math.js with lines longer than 80 characters. * Wrapping long lines Wrapping lines that are too long. * Changing boolean casing Changing boolean casing to be lowercase.
2016-07-08 11:43:48 -07:00
for (var i = 0; i < this.fieldRow.length; i++) {
this.fieldRow[i].init(this.sourceBlock_);
}
};
/**
* Sever all links to this input.
*/
Blockly.Input.prototype.dispose = function() {
if (this.outlinePath) {
goog.dom.removeNode(this.outlinePath);
}
2013-12-20 16:25:26 -08:00
for (var i = 0, field; field = this.fieldRow[i]; i++) {
field.dispose();
}
if (this.connection) {
this.connection.dispose();
}
this.sourceBlock_ = null;
};
/**
* Create the input shape path element and attach it to the given SVG element.
* @param {!SVGElement} svgRoot The parent on which ot append the new element.
* @package
*/
Blockly.Input.prototype.initOutlinePath = function(svgRoot) {
if (!this.sourceBlock_.workspace.rendered) {
return; // Headless blocks don't need field outlines.
}
if (this.outlinePath) {
return;
}
if (this.type == Blockly.INPUT_VALUE) {
this.outlinePath = Blockly.utils.createSvgElement(
2018-05-02 11:05:43 -07:00
'path',
{
'class': 'blocklyPath',
'style': 'visibility: hidden', // Hide by default - shown when not connected.
'd': '' // IE doesn't like paths without the data definition, set an empty default
},
svgRoot);
}
};