Merge changes from Sugarizer for env.js #134
Open
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
llaske
requested changes
Apr 13, 2020
| "sugar-web/datastore", | ||
| "sugar-web/graphics/icon", | ||
| "sugar-web/graphics/activitypalette"], function ( | ||
| "sugar-web/activity/shortcut", |
There was a problem hiding this comment.
Don't change identation style
| @@ -21,23 +22,31 @@ define(["webL10n", | |||
| function sendPauseEvent() { | |||
| var pauseEvent = document.createEvent("CustomEvent"); | |||
| pauseEvent.initCustomEvent('activityPause', false, false, { | |||
| 'cancelable': true}); | |||
There was a problem hiding this comment.
Just indentation change, should not be updated
| function sendStopEvent() { | ||
| var stopEvent = document.createEvent("CustomEvent"); | ||
| stopEvent.initCustomEvent('activityStop', false, false, { | ||
| 'cancelable': true}); | ||
|
|
||
| 'cancelable': true |
There was a problem hiding this comment.
Still indentation change only
| if (!environment.objectId) { | ||
| datastoreObject.setMetadata({ | ||
| "title": environment.activityName + " Activity", | ||
| "title": env.isSugarizer() ? | ||
| (l10n[environment.user.language] || l10n["en"]).replace("{{name}}", environment.activityName) : environment.activityName + " Activity", |
There was a problem hiding this comment.
Did you test in Sugar is the environnement.user.language property exist?
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.
Part of #127
With reference to #133
Merged changes from Sugarizer to
env.js, with corresponding changes toactivity.js.