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.

Sign up for GitHub

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

Jump to bottom

Improved the JSON authoring view #1207

Merged
merged 8 commits into from
May 24, 2018
Merged

Improved the JSON authoring view #1207

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a09bd47
Authoring Tool: Added a "Valid JSON" and "Invalid JSON" message when …
geoffreykwan May 21, 2018
d8b9f0e
Authoring Tool: Renamed the showValidJSONMessage() function to showJS…
geoffreykwan May 21, 2018
15b599e
Authoring Tool: Moved the showJSONValidMessage() functions to the Uti…
geoffreykwan May 21, 2018
613ddae
Authoring Tool: Updated the autoSaveProjectJSONString() function to n…
geoffreykwan May 21, 2018
d4329b8
Made the step JSON authoring view display the "JSON Valid" or "JSON I…
geoffreykwan May 21, 2018
1b4f63b
Discussion: Updated the JSON authoring view to be more user friendly …
geoffreykwan May 22, 2018
b9b44b0
Added a check mark for valid and x for invalid. Also increased the fo…
geoffreykwan May 24, 2018
af0d915
AT: Hide JSON textbox for advanced activity authoring if the JSON is …
hirokiterashima May 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/main/webapp/wise5/authoringTool/authoringToolController.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ class AuthoringToolController {
} else {
this.projectTitle = null;
}
this.turnOffJSONValidMessage();
}

turnOffJSONValidMessage() {
this.$rootScope.$broadcast('setIsJSONValid', { isJSONValid: null });
}

/**
Expand Down
6 changes: 6 additions & 0 deletions src/main/webapp/wise5/authoringTool/authoringToolController.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/webapp/wise5/authoringTool/authoringToolController.js.map
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions src/main/webapp/wise5/authoringTool/components/shared/toolbar/toolbar.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ class ToolbarController {
}
this.globalMessage = params.globalMessage;
});
this.$rootScope.$on('setIsJSONValid', (event, params) => {
this.isJSONValid = params.isJSONValid;
});
}

toggleMenu() {
Expand Down Expand Up @@ -39,6 +42,8 @@ const Toolbar = {
<span class="toolbar__title" ng-if="!$ctrl.showStepTools">{{ $ctrl.viewName }}</span>
<step-tools ng-if="$ctrl.showStepTools" show-position="$ctrl.numberProject"></step-tools>
<div flex></div>
<span ng-if="$ctrl.isJSONValid === true" style="color: green; font-size: 14px">{{ 'jsonValid' | translate }}</span>
<span ng-if="$ctrl.isJSONValid === false" style="color: red; font-size: 14px">{{ 'jsonInvalid' | translate }}</span>
<div style="width: 40px; height: 40px;">
<md-progress-circular ng-if="$ctrl.isProgressIndicatorVisible"
md-mode="indeterminate"
Expand Down
5 changes: 4 additions & 1 deletion src/main/webapp/wise5/authoringTool/components/shared/toolbar/toolbar.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/webapp/wise5/authoringTool/components/shared/toolbar/toolbar.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/main/webapp/wise5/authoringTool/i18n/i18n_en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@
"isVisitable": "Is Visitable",
"isVisited": "Is Visited",
"json": "JSON",
"jsonInvalid": "JSON Invalid",
"jsonValid": "JSON Valid",
"labelLink": "Label (Link)",
"labelPlural": "Label (Plural)",
"labelSingular": "Label (Singular)",
Expand Down Expand Up @@ -224,6 +226,7 @@
"projectCreatedOn": "Project created on ",
"projectHome": "Project Home",
"projectJSON": "Project JSON",
"jsonInvalidErrorMessage": "The JSON is invalid. Invalid JSON will not be saved.\nClick \"OK\" to revert back to the last valid JSON.\nClick \"Cancel\" to keep the invalid JSON open so you can fix it.",
"projectsList": "Projects List",
"projectStyles": "Project Styles",
"projectStructure": "Project Structure",
Expand Down
4 changes: 3 additions & 1 deletion src/main/webapp/wise5/authoringTool/node/node.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,9 @@ <h6 ng-if='projectController.isGroupNode(nodeAuthoringController.nodeId)'>{{ 'ed
<h6 ng-if='!projectController.isGroupNode(nodeAuthoringController.nodeId)'>{{ 'editStepJSON' | translate }}</h6>
<md-input-container style='width: 100%;'>
<textarea ng-model='nodeAuthoringController.authoringNodeContentJSONString'
style='width: 90%; border: 1px solid black;'></textarea>
ng-change='nodeAuthoringController.autoSaveJSON()'
ng-model-options='{ debounce: 1000 }'
style='width: 90%; border: 1px solid black;'></textarea>
</md-input-container>
</div>
</div>
Expand Down
Loading