Merge Google/master and Google/develop #156
Merged
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
Add a getter; stop accessing private field sourceBlock_ from outside …
Move constants to their own file
Undo/Redo
Issue 295.
css to mark text as unselectable instead. I can't prove this is significantly faster with numbers since the call to setup the time out costs ~.1ms and the call when the timer fires is ~.05. This happens on almost every mouse event though. Plus, it seems to remove a flicker of highlighting when frames are skipped and keeps scrolling via the scrollbar from highlighting.
Remove Blockly.removeAllRanges and replace it with calls to add/remove
Previously if a workspace.clear() was executed whilst a field was being edited then the following errors would appear in the console and the blockly workspace would become unresponsive.
Uncaught TypeError: Cannot read property 'removeChangeListener' of null(anonymous function) @ blockly_compressed.js:19071Blockly.WidgetDiv.hide @ blockly_compressed.js:20609Blockly.WidgetDiv.hideIfOwner @ blockly_compressed.js:20620Blockly.FieldTextInput.dispose @ blockly_compressed.js:18961Blockly.Input.dispose @ blockly_compressed.js:15786Blockly.Block.dispose @ blockly_compressed.js:17275Blockly.BlockSvg.dispose @ blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @ blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @ blockly_compressed.js:18327Blockly.Block.dispose @ blockly_compressed.js:17272Blockly.BlockSvg.dispose @ blockly_compressed.js:18327Blockly.Workspace.clear @ blockly_compressed.js:14510window.onmessage @ index.html:175
blockly_compressed.js:19041
Uncaught TypeError: Cannot read property 'scale' of nullBlockly.FieldTextInput.resizeEditor_ @ blockly_compressed.js:19041Blockly.Workspace.fireChangeListener @ blockly_compressed.js:14544Blockly.Events.fireNow_ @ blockly_compressed.js:18833
Explicitly hiding the popup div first avoids this problem.
Clearing the workspace now works even if a field is being edited
Move option parsing to its own file and decompose functions in inject.js
Add isConnected() to connections.
…dered Move Blockly.Block rendered into Blockly.BlockSvg
# Conflicts: # blockly_compressed_horizontal.js # blockly_uncompressed_vertical.js # blocks_compressed.js # core/block.js # core/block_svg.js # core/blockly.js # core/connection.js # core/field_textinput.js # core/workspace_svg.js # generators/lua/lists.js # generators/lua/text.js # msg/js/he.js # msg/js/id.js # msg/js/sr.js # msg/js/zh-hant.js # msg/json/en.json
…le-master-april-1 # Conflicts: # blockly_compressed_horizontal.js # core/block.js # core/block_render_svg_vertical.js # core/connection.js # core/inject.js
picklesrus
pushed a commit
to picklesrus/scratch-blocks
that referenced
this pull request
Aug 4, 2017
SpriteInfo: Design + refactor pass * Updated SVG icons * Added tab indexes, related scratchfoundation#88. Still no tab on radio buttons * Removed outline on dropdown focus * Radio icons: fixed redirecting issue, using `div` instead of `a`. Temporary, until radio buttons. Related scratchfoundation#156 * All icons: unselectable to prevent highlighting. Radio icons clickable * SpriteSelector: fixed bottom padding in scroll wrapper
picklesrus
pushed a commit
to picklesrus/scratch-blocks
that referenced
this pull request
Aug 4, 2017
…ion#250) Fixes scratchfoundation#156 + refactored classnames to style guide conventions
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.
No description provided.