Integrate Hints into new Top Instructions#9559
Merged
Merged
Conversation
…low [test ui] [test all]
| var hints = this.contextualHints_.concat(this.hints_ || []); | ||
| return hints.filter(function (hint) { | ||
| return hint.alreadySeen === false; | ||
| }); |
Contributor
There was a problem hiding this comment.
Do you need the || [] here and below? I thought setting redux initial state would ensure that they're always defined.
Contributor
|
LGTM |
| }, | ||
| }; | ||
|
|
||
| var TopInstructions = React.createClass({ |
Contributor
There was a problem hiding this comment.
Is there any code in this JSX file that can be shared with https://github.com/code-dot-org/code-dot-org/commits/staging/apps/src/templates/instructions/TopInstructionsCSP.jsx?
Contributor
Author
There was a problem hiding this comment.
possibly; I can explore that idea, but I'd like to do so in a separate PR
Contributor
|
Hmm, seeing different styles for hints on Minecraft. The arrows are clipped on the right side:
Let me know if you can't repro locally and I'll see if something isn't rebuilding for me. |
Contributor
Author
|
I can repro; will fix |
Conflicts: apps/src/templates/instructions/TopInstructionsCSF.jsx
f031dd1 to
ea5c048
Compare
deploy-code-org
added a commit
that referenced
this pull request
Jul 25, 2016
906f3ad Merge pull request #9559 from code-dot-org/topInstructions-integrate-hints (Elijah Hamovitz) 40e882e Merge pull request #9546 from code-dot-org/animation-sizes (Caley Brock) b3a9bbb Merge pull request #9660 from code-dot-org/pd-workshop-join-section (Andrew Oberhardt) ea5c048 Merge branch 'staging' into topInstructions-integrate-hints (Elijah Hamovitz) de6955d missing semicolon fix (Caley Brock) 6bc0459 PR feedback: renamed unit test variables and added comment (Andrew Oberhardt) 85f27bb code review: fix typo (Caley Brock) 2653697 staging content changes (-Ram) (Continuous Integration) f0fcf5c Remove not needed comment (Caley Brock) 8fb23f7 Merge pull request #9675 from code-dot-org/levelbuilder (Ram Kandasamy) ad499a1 Modify p5play to initialize sprite height and width and not change them during update (Caley Brock) 79e2eff levelbuilder content changes (-Ram) (Continuous Integration) 851caa6 Merge pull request #9620 from code-dot-org/photo-credit (Tanya Parker) 0e067b3 Merge pull request #9661 from code-dot-org/peer_review_in_course_ui (Mehal Shah) df67e16 I am annoyed that this works (Mehal Shah) ac5bcd1 staging content changes (-Ram) (Continuous Integration) 6043087 Automatically built. (Continuous Integration) c43f297 remove custom scroll handler, instead hide native scrollbar (Elijah Hamovitz)
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Spec
Integrates Hints (both Authored and Contextual) into new top instructions.
Also includes some styling additions and tweaks:
Chat-style bubbles (for appropriate skins):
Minecraft styling (pending approval)
