-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Merge latest google/develop Blockly #111
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
tmickel
merged 30 commits into
scratchfoundation:develop
from
tmickel:feature/upstream-merge
Mar 3, 2016
Merged
Merge latest google/develop Blockly #111
tmickel
merged 30 commits into
scratchfoundation:develop
from
tmickel:feature/upstream-merge
Mar 3, 2016
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
Minor connection refactor
…tor_continue Add tests for connection logic
Extract rendering code from block_svg.
calls come before all of the setAttribute calls. This gets rid of an unnecessary layout pass on mouseMove events.
Rearrange code in ScrollbarPair set so that all the getAttribute
# Conflicts: # blockly_compressed_vertical.js # blockly_uncompressed_vertical.js # core/connection.js # tests/jsunit/index.html # tests/playground.html
tmickel
added a commit
that referenced
this pull request
Mar 3, 2016
Merge latest google/develop Blockly
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.
Fixes #82 and #64.