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

Fix #6943: Fix code editor interaction issue in exploration player. #6948

Merged
merged 2 commits into from
Jun 17, 2019
Merged

Fix #6943: Fix code editor interaction issue in exploration player. #6948

merged 2 commits into from
Jun 17, 2019

Conversation

DubeySandeep
Copy link
Member

@DubeySandeep DubeySandeep commented Jun 16, 2019 •
edited
Loading

Explanation

Fixes #6943, by adding required dependencies for playing code editor.

image

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The linter/Karma presubmit checks have passed.
    • These should run automatically, but if not, you can manually trigger them locally using python scripts/pre_commit_linter.py and bash scripts/run_frontend_tests.sh.
  • The PR is made from a branch that's not called "develop".
  • The PR has an appropriate "CHANGELOG: ..." label (If you are unsure of which label to add, ask the reviewers for guidance).
  • The PR follows the style guide.
  • The PR addresses the points mentioned in the codeowner checks for the files/folders changed. (See the codeowner's wiki page.)
  • The PR is assigned to an appropriate reviewer.
    • If you're a new contributor, please ask on Gitter for someone to assign a reviewer and don't tick this checkbox.
    • If you're not sure who the appropriate reviewer is, please assign to the issue's "owner" -- see the "talk-to" label on the issue. Do not only request the review but also add the reviewer as an assignee.

@DubeySandeep DubeySandeep requested a review from aks681 as a code owner June 16, 2019 22:44
vojtechjelinek
vojtechjelinek suggested changes Jun 16, 2019
View reviewed changes
Copy link
Contributor

@vojtechjelinek vojtechjelinek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Jsut two things.

core/templates/dev/head/pages/exploration-player-page/exploration-player-page.controller.ts Outdated
@@ -105,6 +105,8 @@ require('domain/exploration/ReadOnlyExplorationBackendApiService.ts');

require('objects/objectComponentsRequiresForPlayers.ts');

require('services/AutoplayedVideosService.ts');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I had an old version of develop locally. You can remove this since it is already on line 82.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

core/templates/dev/head/pages/exploration-player-page/exploration-player-page.controller.ts Outdated
@@ -105,6 +105,8 @@ require('domain/exploration/ReadOnlyExplorationBackendApiService.ts');

require('objects/objectComponentsRequiresForPlayers.ts');

require('services/AutoplayedVideosService.ts');
require('services/CodeNormalizerService.ts');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please move this directly after line 82.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done!

@DubeySandeep
Copy link
Member Author

@vojtechjelinek, I've made the changes PTAL!

vojtechjelinek
vojtechjelinek approved these changes Jun 16, 2019
View reviewed changes
Copy link
Contributor

@vojtechjelinek vojtechjelinek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@codecov
Copy link

codecov bot commented Jun 17, 2019

Codecov Report

Merging #6948 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6948   +/-   ##
========================================
  Coverage    95.73%   95.73%           
========================================
  Files          371      371           
  Lines        51604    51604           
========================================
  Hits         49404    49404           
  Misses        2200     2200

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46ae61e...903b977. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Jun 17, 2019

Codecov Report

Merging #6948 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6948   +/-   ##
========================================
  Coverage    95.73%   95.73%           
========================================
  Files          371      371           
  Lines        51604    51604           
========================================
  Hits         49404    49404           
  Misses        2200     2200

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46ae61e...903b977. Read the comment docs.

@seanlip
Copy link
Member

seanlip commented Jun 17, 2019

@aks681 PTAL and cherrypick. Thanks!

aks681
aks681 approved these changes Jun 17, 2019
View reviewed changes
Copy link
Contributor

@aks681 aks681 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@aks681 aks681 merged commit 6fe56fa into oppia:develop Jun 17, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aks681 aks681 aks681 approved these changes

@vojtechjelinek vojtechjelinek vojtechjelinek approved these changes

Assignees

@aks681 aks681

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Blocking bug: Code interaction is broken in develop in the player view
4 participants
@DubeySandeep @seanlip @vojtechjelinek @aks681