Center variable reporter; fix field centering to work for it #1035
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
aaah emoji support |
thisandagain
approved these changes
Aug 1, 2017
|
🎉 🐱 🌮 @carljbowman This looks good functionally. Do you want to give it a look before landing? |
carljbowman
approved these changes
Aug 1, 2017
There was a problem hiding this comment.
@tmickel - Yes!!! This has been driving me nuts for a while. Haha also a bit dangerous that I now know I can email you requests.
Thanks for fixing!
|
So should all single-field blocks have center align for their field? Also gets back to the conversation we were having about alignment. |
msintov
pushed a commit
to msintov/scratch-blocks
that referenced
this pull request
Sep 2, 2017
…dation#1023) (scratchfoundation#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
msintov
pushed a commit
to msintov/scratch-blocks
that referenced
this pull request
Sep 2, 2017
* Move createDom call into the constructor of block drag surface. (scratchfoundation#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. (scratchfoundation#805) * Don't connect to blocks under the flyout. * recompile again. (scratchfoundation#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 scratchfoundation#813 by ademenev * Localisation updates from https://translatewiki.net. * PR scratchfoundation#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. (scratchfoundation#820) From commits b77f8cb and 4ecdede * Naming changes in mirror demo * Adding support for untranslated messages. (scratchfoundation#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. (scratchfoundation#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 scratchfoundation#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" (scratchfoundation#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. (scratchfoundation#836) Fixes commits in scratchfoundation#832. * Adding extensions for JSON support of dynamic blocks. (scratchfoundation#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 … (scratchfoundation#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 scratchfoundation#816 so that layering of the flyout and workspace scrollbars are done correctly. * JSON definitions for colour blocks (scratchfoundation#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) (scratchfoundation#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 (scratchfoundation#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 (scratchfoundation#844) * Localisation updates from https://translatewiki.net. * Porting math.js blocks to JSON (scratchfoundation#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. (scratchfoundation#851) Fixes scratchfoundation#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). (scratchfoundation#861) * Localisation updates from https://translatewiki.net. * .getOptions_() to .getOptions() (scratchfoundation#869) Fixes scratchfoundation#867. * Blockly.Extensions.buildTooltipForDropdown(..): Deferred validation. (scratchfoundation#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 (scratchfoundation#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 (scratchfoundation#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 scratchfoundation#892. I incorrectly converted one CSS transform setting to use the cross-browser setting function in 40a063763c74b3f712c3057565966c25d5cfdb10. (scratchfoundation#895) * Adding @namespace annotations for JSDoc. (scratchfoundation#900) * Fix typo causing TypeError (scratchfoundation#901) * Pinning the angular2 dependency, and including licenses. (scratchfoundation#893) * Add skeleton for tests on rendered workspaces * Fix some lint errors * Localisation updates from https://translatewiki.net. * Correct changedState in setWarningText() (scratchfoundation#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(). (scratchfoundation#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 (scratchfoundation#913) Extensions, mixins, mutators and constants now grouped under the new namespace Blockly.Constants.Logic. * Improving errors/warnings with Block.toDevString() and Connection.toString(). (scratchfoundation#911) * Add isEditable to field, and add tests * Separate tests * Blockly.Constants.Math and Blockly.Constants.Colour extension constants (scratchfoundation#916) Also, correcting quotes in logic.js. * Correction to logic_ternary type check (scratchfoundation#920) * Porting Loop blocks to JSON (scratchfoundation#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. (scratchfoundation#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 scratchfoundation#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. (scratchfoundation#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 scratchfoundation#946. Don't check for presence of constants.js * Fix scratchfoundation#945 (annotations) and an eslint issue (constant condition) * Localisation updates from https://translatewiki.net. * Fix scratchfoundation#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 scratchfoundation#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() (scratchfoundation#962) This is a copy (with additional comments) of PR scratchfoundation#822 (and also scratchfoundation#961) by @qnoirhomme with unrelated files removed. See scratchfoundation#822 for full review. * Annotation fixes * Fix bug scratchfoundation#904 by explicitly grabbing focus on the workspace svg element. (scratchfoundation#964) * Potential fix for scratchfoundation#888. Stops checking whether we are mid workspace drag since we do not always get mosue up events when blockly is in an iframe. (scratchfoundation#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 scratchfoundation#962 (scratchfoundation#970) * Cross browser friendly fix for scratchfoundation#904. This calls blur and focus from … (scratchfoundation#972) * Cross browser friendly fix for scratchfoundation#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 scratchfoundation#904 to keep the page from jumping to the focused workspace in IE 11 (scratchfoundation#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 scratchfoundation#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 d55d9cb). IIUC, updateWidth/getCachedWidth was only called from render before which is overridden in FieldImage to be a no-op already. (scratchfoundation#979) * Fix scratchfoundation#969 * Localisation updates from https://translatewiki.net. * Fix scratchfoundation#986. Looks like the original PR just forgot this block. (scratchfoundation#992) * rebuild develop (scratchfoundation#996) * Added the variable modal and component and implemented basic renaming functionality. (scratchfoundation#991) * Fixing commenting from the last commit. (scratchfoundation#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. (scratchfoundation#1011) * Minimap position bug fix for browsers other than chrome. Added touch support. * Adding an add variable modal to accessible Blockly. (scratchfoundation#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. (scratchfoundation#1017) Centralizes accessible modal behavior. * - Changed error message referencing 'procedure' instead of 'function' (scratchfoundation#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,… (scratchfoundation#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). (scratchfoundation#1027) * Enable google/blockly with continuous build on travis ci (scratchfoundation#1023) (scratchfoundation#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 scratchfoundation#880. * Ensure useDragSurface is a boolean. Fixed scratchfoundation#988 * use pretest instead of preinstall in package.json (scratchfoundation#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 scratchfoundation#973 * bumpNeighbours_ function moved to block_svg. Fixed scratchfoundation#1009 * Update RegEx in js-to-json to match windowi eol (scratchfoundation#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 (scratchfoundation#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. (scratchfoundation#1054) * Correcting scratchfoundation#1054 (scratchfoundation#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… (scratchfoundation#1057) * Change how blockly handles cursors. The old way was quite slow because it changed the stylesheet directly. See issue scratchfoundation#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. (scratchfoundation#1059) * Merge master into develop (scratchfoundation#1063) - pick up translation changes - clean up trailing spaces * use goog.string.startswith instead of string.startswith (scratchfoundation#1065) * New jsinterpreter demo includes wait block. Both demos have improved UI for clarity. (scratchfoundation#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 scratchfoundation#1069 (scratchfoundation#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
msintov
pushed a commit
to msintov/scratch-blocks
that referenced
this pull request
Sep 2, 2017
* JSON definitions for colour blocks (scratchfoundation#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) (scratchfoundation#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 (scratchfoundation#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 (scratchfoundation#844) * Localisation updates from https://translatewiki.net. * Porting math.js blocks to JSON (scratchfoundation#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. (scratchfoundation#851) Fixes scratchfoundation#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). (scratchfoundation#861) * Localisation updates from https://translatewiki.net. * .getOptions_() to .getOptions() (scratchfoundation#869) Fixes scratchfoundation#867. * Blockly.Extensions.buildTooltipForDropdown(..): Deferred validation. (scratchfoundation#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 (scratchfoundation#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 (scratchfoundation#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 scratchfoundation#892. I incorrectly converted one CSS transform setting to use the cross-browser setting function in 40a063763c74b3f712c3057565966c25d5cfdb10. (scratchfoundation#895) * Adding @namespace annotations for JSDoc. (scratchfoundation#900) * Fix typo causing TypeError (scratchfoundation#901) * Pinning the angular2 dependency, and including licenses. (scratchfoundation#893) * Add skeleton for tests on rendered workspaces * Fix some lint errors * Localisation updates from https://translatewiki.net. * Correct changedState in setWarningText() (scratchfoundation#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(). (scratchfoundation#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 (scratchfoundation#913) Extensions, mixins, mutators and constants now grouped under the new namespace Blockly.Constants.Logic. * Improving errors/warnings with Block.toDevString() and Connection.toString(). (scratchfoundation#911) * Add isEditable to field, and add tests * Separate tests * Blockly.Constants.Math and Blockly.Constants.Colour extension constants (scratchfoundation#916) Also, correcting quotes in logic.js. * Correction to logic_ternary type check (scratchfoundation#920) * Porting Loop blocks to JSON (scratchfoundation#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. (scratchfoundation#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 scratchfoundation#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. (scratchfoundation#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 scratchfoundation#946. Don't check for presence of constants.js * Fix scratchfoundation#945 (annotations) and an eslint issue (constant condition) * Localisation updates from https://translatewiki.net. * Fix scratchfoundation#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 scratchfoundation#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() (scratchfoundation#962) This is a copy (with additional comments) of PR scratchfoundation#822 (and also scratchfoundation#961) by @qnoirhomme with unrelated files removed. See scratchfoundation#822 for full review. * Annotation fixes * Fix bug scratchfoundation#904 by explicitly grabbing focus on the workspace svg element. (scratchfoundation#964) * Potential fix for scratchfoundation#888. Stops checking whether we are mid workspace drag since we do not always get mosue up events when blockly is in an iframe. (scratchfoundation#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 scratchfoundation#962 (scratchfoundation#970) * Cross browser friendly fix for scratchfoundation#904. This calls blur and focus from … (scratchfoundation#972) * Cross browser friendly fix for scratchfoundation#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 scratchfoundation#904 to keep the page from jumping to the focused workspace in IE 11 (scratchfoundation#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 scratchfoundation#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 d55d9cb). IIUC, updateWidth/getCachedWidth was only called from render before which is overridden in FieldImage to be a no-op already. (scratchfoundation#979) * Fix scratchfoundation#969 * Localisation updates from https://translatewiki.net. * Fix scratchfoundation#986. Looks like the original PR just forgot this block. (scratchfoundation#992) * rebuild develop (scratchfoundation#996) * Added the variable modal and component and implemented basic renaming functionality. (scratchfoundation#991) * Fixing commenting from the last commit. (scratchfoundation#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. (scratchfoundation#1011) * Minimap position bug fix for browsers other than chrome. Added touch support. * Adding an add variable modal to accessible Blockly. (scratchfoundation#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. (scratchfoundation#1017) Centralizes accessible modal behavior. * - Changed error message referencing 'procedure' instead of 'function' (scratchfoundation#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,… (scratchfoundation#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). (scratchfoundation#1027) * Enable google/blockly with continuous build on travis ci (scratchfoundation#1023) (scratchfoundation#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 scratchfoundation#880. * Ensure useDragSurface is a boolean. Fixed scratchfoundation#988 * use pretest instead of preinstall in package.json (scratchfoundation#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 scratchfoundation#973 * bumpNeighbours_ function moved to block_svg. Fixed scratchfoundation#1009 * Update RegEx in js-to-json to match windowi eol (scratchfoundation#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 (scratchfoundation#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. (scratchfoundation#1054) * Correcting scratchfoundation#1054 (scratchfoundation#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… (scratchfoundation#1057) * Change how blockly handles cursors. The old way was quite slow because it changed the stylesheet directly. See issue scratchfoundation#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. (scratchfoundation#1059) * Merge master into develop (scratchfoundation#1063) - pick up translation changes - clean up trailing spaces * use goog.string.startswith instead of string.startswith (scratchfoundation#1065) * New jsinterpreter demo includes wait block. Both demos have improved UI for clarity. (scratchfoundation#1001) Refactor of interpreter demo * Renamed demos/interpreter/index.html as demos/interpreter/step-execution.html (including redirect), and added demos/interpreter/async-execution.html. * Refactored code to automatically generate/parse the blocks, eliminating the need for a "Parse JavaScript" button. Code is still shown in alert upon stepping to the first statement. Print statements now write to output <textarea> instead of modal dialogs. * VariableMap and functions added. * Create separate file for VariableMap and its functions. * Fix scratchfoundation#1069 (scratchfoundation#1073) * VariableMap and functions added. * Fix scratchfoundation#1051 (scratchfoundation#1084) * Improve errors when validating JSON block definitions. (scratchfoundation#1086) goog.asserts to not run from blockly_compressed.js. User data validation should always run. * Dragging changes, rebased on develop (scratchfoundation#1078) * Add block drag surface translateSurfaceBy * Add dragged connection manager * Add gesture.js * Add GestureHandler * Implemented gesture skeleton * Most basic workspace dragging * Add dragged connection manager * cleanup * doc * more cleanup * Add gesture handler * Add translateSurfaceInternal * core/block_dragger.js * cleanup * Pull in changes to dragged connection manager * Pull in changes to dragged connection manager * comments * more annotations * Add workspace dragger * Add coordinate annotations * Start on block dragging * Limit number of concurrent gestures * Add some TODOs * start using dragged connection manager * Set origin correctly for dragging blocks * Connect or delete at the end of a block drag. * cleanup * handle field clicks and block + workspace right-clicks * move code into BlockDragger class, but still reach into Gesture internals a lot * Clean up block dragger * Call blockDragger constructor with correct arguments * Enable block dragging in a mutator workspace * Add workspace dragger * click todos * Drag flyout with background * more dragging from flyout * nit * fix dragging from flyouts * Remove unused code and rename gestureHandler to gestureDB * Rename gesture handler * Added some jsdoc in gesture.js * Update some docs * Move some code to block_svg and clean up code * Lots of coordinate annotations * Fix block dragging when zoomed. * Remove built files from branch * More dragging work (scratchfoundation#1026) -- Drag bubbles while dragging blocks -- Use bindEventWithChecks to work in touch on Android. Not tested anywhere else yet. -- Handle dragging blocks while zoomed -- Handle dragging blocks in mutators -- Handle right-clicks (I hope) -- Removed lots of unused code * More dragging work (scratchfoundation#1048) - Removed gestureDB - Removing uses of terminateDrag - Cleaned up disposal code * Dragging bugfixes (scratchfoundation#1058) - Get rid of flyout.dragMode_ and blockly.dragMode_ - Make drags from the flyout start from the top block in the group - Block tooltips from being scheduled or shown during gestures - Don't resize mutator bubbles mid-drag * Fix events in new dragging (scratchfoundation#1060) * rebuild for testing * unbuild * Fix events * rebuild * Fix up cursors * Use language files from develop * Remove handled TODOS * attempt to fix IE rerendering bug, and recalculate workspace positions on scroll * Rebuild all the things * Comment cleanup; annotations; delete unused variables. * Tidy up context menu code. (scratchfoundation#1081) * add osx travis test run job (scratchfoundation#1074) * Names are correctly fetched from VariableModels! * add more wait time for test setup (scratchfoundation#1091) * Work around timing issue with travis osx issue (scratchfoundation#1092) * add more wait time for test setup * increase selenium wait time * add more wait * Fix scratchfoundation#1077 by adding a rule to cover the toolbox labels too. (scratchfoundation#1099) * Assign variable UUID to field_variable dropdown. * Change registration link to a static one (scratchfoundation#1106) This lets us redirect to a different form if we change it in the future. * Edit generators to read in Variable Models. * Add VariableMap requirement to workspace. * Changed parameter name in workspace for clarity. * Add type, id, and info to the generated xml. Add xml tests for fieldToDom. Update workspace tests to pass with new changes. * Fix apostrophe in tooltips and helpurls (scratchfoundation#1111) * Click events on shadow blocks have the correct id (scratchfoundation#1089) * Add image_onclick option (scratchfoundation#1080) * Cleanup: semicolons, spacing, etc. (scratchfoundation#1116) * Spelling. Spelling is hard. * Add variable info to xml generated in variables.js * Add missing CLAs info to the contributing file (scratchfoundation#1119) * Add missing CLAs info to the contributing file * Added larger changes paragraph * Replacing latest prettifier hosted in repo with latest version at rawgit CDN. (scratchfoundation#1120) * Forgot update code demo (scratchfoundation#1121) * Move audio code to a new file (scratchfoundation#1122) * move audio code to a new file * dispose * null check * Make flyout get variables from target workspace's variableMap. * Require VariableModel in field_variable.js. * Update contributing.md (scratchfoundation#1126) * Include variables at top of serialization. * Move blockSvg.getHeightWidth to block_render_svg.js (scratchfoundation#1118) * Deserialization variables at top. * Create grid object (scratchfoundation#1131) * Create grid object * Doc * Units! Thanks @RoboErikG * Add our sound files in other formats * Remove duplicate merged code * Remove translation files * Cleanup duplicate functions * Add back scrollbar code * Fix variable related issues * Revert workspace variable creation change * Delete language files * Appease linter * Remove duplication * Add spaces to jsdoc line
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves
--
Proposed Changes
Before:
After:
Reason for Changes
Variables named with "text with a small width" (e.g., a single character) were not aligned in the center of the reporter. By adding the CENTRE alignment (and fixing its implementation), they are.
Test Coverage
--