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.

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

Remove oppia module export. #7259

Merged
merged 27 commits into from
Aug 1, 2019
Merged

Remove oppia module export. #7259

merged 27 commits into from
Aug 1, 2019

Conversation

YashJipkate
Copy link
Contributor

Explanation

Removes the var oppia = require('AppInit.ts') statements. This PR sits on top of #7254

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 "PROJECT: ..." label (Please add this label for the first-pass review of the PR).
  • 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.

Copy link
Member

@seanlip seanlip left a comment

Choose a reason for hiding this comment

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

Thanks @YashJipkate. Just one inline comment. I also think @vojtechjelinek should take a look at the webpack config file, but other than that, we can merge this PR after he and I give approval (you don't need to wait for the other codeowners).

Thanks!

var oppia = require('AppInit.ts').module;

oppia.factory('ExpressionParserService', ['$log', function($log) {
angular.module('oppia').factory('ExpressionParserService', ['$log', function($log) {
Copy link
Member

Choose a reason for hiding this comment

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

This is a generated file, so make sure that the generator script in this folder is configured to generate this new text properly. See the README in this folder.

It might be nice to also add a comment at the top of the file saying "DO NOT MODIFY THIS FILE DIRECTLY, see XXX instead."

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Modified the create_expression_parser script.

@@ -187,7 +187,7 @@ oppia.directive('tutorCard', [

$scope.toggleShowPreviousResponses = function() {
$scope.arePreviousResponsesShown =
!$scope.arePreviousResponsesShown;
!$scope.arePreviousResponsesShown;
Copy link
Member

Choose a reason for hiding this comment

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

This should be indented by 2. Put a '(' ')' around it if needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done!

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!

@seanlip
Copy link
Member

seanlip commented Aug 1, 2019

Please note the Travis failures.

@YashJipkate YashJipkate closed this Aug 1, 2019
@YashJipkate YashJipkate reopened this Aug 1, 2019
@YashJipkate YashJipkate closed this Aug 1, 2019
@YashJipkate YashJipkate reopened this Aug 1, 2019
@seanlip seanlip merged commit 3923234 into oppia:develop Aug 1, 2019
cuichenli pushed a commit to cuichenli/oppia that referenced this pull request Aug 2, 2019
* Half

* half

* half

* Cleanup

* Cleanup

* Cleanup

* Break line

* Remove var oppia from App.ts

* Removed var oppia

* Removed var oppia

* Partial lint

* FIx FE

* Partial lint

* Partial lint

* Partial lint

* Partial lint

* Fix learner dashboard

* Partial lint

* Lint

* Address review

* Update package.json

* Update package.json

* Revert "Update package.json"

This reverts commit 0530a8c.

* Revert "Update package.json"

This reverts commit c18ff6a.

* Revert "Address review"

This reverts commit 333e7fa.

* Revert package.json
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.

4 participants