Skip to content

hoc2015: show narrator image in error dialogs in levels 1-6 again.#5501

Merged
breville merged 1 commit into
stagingfrom
hoc2015erroravatar
Nov 20, 2015
Merged

hoc2015: show narrator image in error dialogs in levels 1-6 again.#5501
breville merged 1 commit into
stagingfrom
hoc2015erroravatar

Conversation

@breville

Copy link
Copy Markdown
Member

#5004 hid the narrator image from slightly more dialogs than needed.. it turns out that we can still show the narrator for error dialogs in levels 1-6 since those all have quoted messages, in the narrator's voice, to the student.

@islemaster

Copy link
Copy Markdown
Contributor

I'm not sure I understand this change in isolation. What I think I'm seeing is that hideIconInClearPuzzle was previously overloaded to also hide the icon in the failure dialog, and we no longer want it to do that (but we still want to use it here?). Is that correct? If not, maybe we should be tearing out the hideIconInClearPuzzle option entirely.

@breville

Copy link
Copy Markdown
Member Author

Yes, in the previously-mentioned change, hideIconInClearPuzzle was overloaded to also hide the win & lose avatars in the result dialog, but we can do that more specifically as this change does.

We still want a way for a skin to hide the icon in the clear puzzle dialog in particular, so I think it's reasonable to keep that flag in the skin for this specific purpose.

@islemaster

Copy link
Copy Markdown
Contributor

LGTM (sorry for the delay)

breville added a commit that referenced this pull request Nov 20, 2015
hoc2015: show narrator image in error dialogs in levels 1-6 again.
@breville breville merged commit 952c8fe into staging Nov 20, 2015
@breville breville deleted the hoc2015erroravatar branch November 20, 2015 21:11
deploy-code-org added a commit that referenced this pull request Nov 20, 2015
952c8fe Merge pull request #5501 from code-dot-org/hoc2015erroravatar (Brendan Reville)
a800328 Automatically built. (Continuous Integration)
deploy-code-org added a commit that referenced this pull request Nov 20, 2015
d367880 Merge pull request #5552 from code-dot-org/delete_first_screen (Mehal Shah)
c9c307d Automatically built. (Continuous Integration)
952c8fe Merge pull request #5501 from code-dot-org/hoc2015erroravatar (Brendan Reville)
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.

2 participants