Feature/merge feb 2017 #791
Conversation
…_nov_3_16 Rebuild nov 3 16
…ld_nov_3_16 Revert "Rebuild nov 3 16"
…move_css Move injected css to start of head
Rename README to README.md
…/import_definitions Add ability to define blocks with a json array
Unblock push to master.
This reverts commit c8ca24a.
…aster_to_develop_nov_11_16 Merge master to develop nov 11 16
…controls_ifelse Remove ifelse block and messages
…_to_master_nov_11_16 Develop to master nov 11 16
Allow images in dropdown menus.
…scratchfoundation#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.
|
Unit tests fixed. @rschamp there are some changes to package.json that may be wrong and/or blocking Travis, but I don't know enough to debug them. Other than the RTL text input rendering, I think this is all good. |
|
RTL text inputs fixed. |
|
It looks like travis is unhappy due to eslint issues with the tests: I think we could just make exceptions here to the |
|
Extremely minor, but I noticed that we now have a stroke around the insertion shadow. |
|
In the horizontal blocks: |
|
"In the horizontal blocks: "Extremely minor, but I noticed that we now have a stroke around the insertion shadow." RE: no-undef: were those rules ever being applied to the unit tests, or is it just that the new unit tests aren't set up to be exceptions and the old ones were? |
rachel-fenichel
force-pushed
the
feature/merge_feb_2017
branch
from
7481b26 to
0e8244b
Compare
Horizontal Block InputsOk! Happy to file an issue and follow-up after. Insertion ShadowThere is no stroke on insertion shadows in Lint IgnoreLooks like you found it. :-) |
|
Insertion shadow: Fixed, I think. Looks like that wasn't quite right before, but two bugs combined to become a feature, and I fixed one of those bugs in this PR. I think I'm all set. If you're happy with this, please squash and merge it in. Then I can write some extension demos for you. |
There was a problem hiding this comment.
When testing in the VM playground, we get a fatal exception on the line:
var flyoutWorkspace = workspace.getFlyout().getWorkspace();
Uncaught TypeError: workspace.getFlyout is not a function
at window.onload (playground.js:64)
Did the API for this change? @rschamp can you please review this as well?
|
I see the same thing. It looks like |
|
Not quite--we failed at the merge last time and ended up with two versions of getFlyout_ in workspace_svg: I removed one to dedupe it. I can fix this for y'all by making workspace:getFlyout and workspace_svg:getFlyout public, though that's out of sync with mainline blockly. Is that the fix you want? |
|
|
Merge google/blockly develop into scratch-blocks develop.