Skip to content
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

Rebase on develop #2599

Merged

Conversation

rachel-fenichel
Copy link
Collaborator

This pulls in the recent changes to move things into utils. I have one commit where I updated a few such calls in the rendering directory, but this was otherwise a straightforward rebase--the only conflicts were in built files.

translatewiki and others added 30 commits June 3, 2019 17:23
Also adds support for ‘#f00’, ‘rgb(255, 0, 0)’ and ‘red’ for block colours, in addition to ‘#ff0000’ (and of course hue).
Blockly now normalizes colours lowercase.
TODO: There are more functions which may be migrated into dom and string.
Search and replace for userAgent didn’t take into account alphabetic ordering.
Also some line wraping.
Old: a box object with two coordinate objects, each with two numbers.
New: a box object with four numbers.

The old system would make sense if there was a reason to group the top-left and bottom-right coordinates.  But in our code we only pulled out top/bottom/left/right numbers.

New code is simpler and faster.
Search and replace of a name strikes again.
Previously it returned x,y,width,height.  Returning top,bottom,left,right results in simpler code, both in this function and in downstream callers.

This commit makes the minumum change to the metrics_test.  I’m happy to change the test’s data if that makes more sense.
Also move SVG_NS and HTML_NS properties.
And fix provide/require mixup.
Instead of top/left/height/width.  Given our uses of Rect, it makes the math slightly simpler.

This is a setup for using Rect in other places.  Currently it is only used to describe delete areas.
1) Simplifications.
2) Enable toolbox category colours to be specified using the full range of CSS formats (not just hue or #rrggbb).
3) Fix bug where `Blockly.utils.checkMessageReferences('%{BKY_today}  %{BKY_xxx}')` returns true.
Blockly.Css.CONTENT isn’t needed after its first use.
There also is no longer a need to store a reference to the stylesheet, just a boolean.
This default Closure image was always being overridden and was never fetched.  But it takes some research to determine that this is not in effect a potential monitoring point.
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request), but were unable to find agreements for all the commit author(s) or Co-authors. If you authored these, maybe you used a different email address in the git commits than was used to sign the CLA (login here to double check)? If these were authored by someone else, then they will need to sign a CLA as well, and confirm that they're okay with these being contributed to Google.
In order to pass this check, please resolve this problem and have the pull request author add another comment and the bot will run again. If the bot doesn't comment, it means it doesn't think anything has changed.

ℹ️ Googlers: Go here for more info.

@rachel-fenichel
Copy link
Collaborator Author

I'm going to go ahead and merge this to set up my next set of changes. It's a rebase; I checked that it works in the playground, and the diffs aren't useful to view.

@rachel-fenichel rachel-fenichel merged commit b46b746 into google:render/collab Jun 29, 2019
@rachel-fenichel rachel-fenichel deleted the render/collab_rebase_jun_28 branch June 29, 2019 01:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants