Resolves #1708, removes v1 button hacks #1751
Merged
Conversation
This file contains 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
Removed the version 1->2 button hacks in preparation for the release of version 3.0.
moloko
approved these changes
Sep 27, 2017
| @@ -40,55 +40,30 @@ define([ | |||
| setupButtonSettings: function() { | |||
| var globalButtons = Adapt.course.get("_buttons"); | |||
There was a problem hiding this comment.
just a recommendation and not a requirement... but would be a good opportunity to use const here instead of var
| if (typeof componentButtons[key] == 'object') { | ||
| // ARIA labels | ||
| if (!componentButtons[key].buttonText && globalButtons[key].buttonText) { | ||
| for (var key in componentButtons) { |
There was a problem hiding this comment.
just a recommendation and not a requirement... but would be a good opportunity to use const here instead of var
|
@brian-learningpool you have a conflict that needs sorting out I'm afraid |
oliverfoster
approved these changes
Jan 22, 2018
moloko
approved these changes
Jan 22, 2018
lc-thomasberger
approved these changes
Jan 22, 2018
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.
Removed the version 1->2 button hacks in preparation for the release of version 3.0.
#1708