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

Introduction to Angular 8 #7048

Merged
merged 46 commits into from
Jul 1, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
af1726e
init
YashJipkate Jun 23, 2019
80344b0
Tries
YashJipkate Jun 23, 2019
362e5f0
required appinit
YashJipkate Jun 23, 2019
13fdd1e
Fix some tests
YashJipkate Jun 23, 2019
f3faa05
Merge
YashJipkate Jun 23, 2019
68ab265
Fix some tests
YashJipkate Jun 23, 2019
e509142
Fix last remaining e2e
YashJipkate Jun 25, 2019
f7be333
Merge
YashJipkate Jun 25, 2019
7eb04bd
Merge
YashJipkate Jun 25, 2019
133ce88
fix failing tests
YashJipkate Jun 25, 2019
5827320
fix failing tests
YashJipkate Jun 25, 2019
a14a67c
restore karma
YashJipkate Jun 25, 2019
d3e6d55
Merge
YashJipkate Jun 25, 2019
055ce76
multi karma tries
YashJipkate Jun 25, 2019
ced6f09
revert multi karma tries
YashJipkate Jun 25, 2019
b0f3a24
Half way mod try
YashJipkate Jun 25, 2019
eed467f
email dashboard mod
YashJipkate Jun 25, 2019
44dcc7c
Tries
YashJipkate Jun 26, 2019
9387631
Clean up and apply workaround
YashJipkate Jun 26, 2019
2f82dce
Merge branch 'develop' into ang-oppia2
YashJipkate Jun 26, 2019
7fc9829
Change name of the combine file
YashJipkate Jun 26, 2019
a51162f
Remove waitforangularenable statement
YashJipkate Jun 26, 2019
d182679
Remove unwanted difs
YashJipkate Jun 26, 2019
333e2ac
Added comments
YashJipkate Jun 26, 2019
3514697
Merge branch 'develop' into ang-oppia2
YashJipkate Jun 26, 2019
099b051
Review changes
YashJipkate Jun 26, 2019
9f172d0
Remove unnecessary additions
YashJipkate Jun 26, 2019
fa0963e
Review
YashJipkate Jun 26, 2019
361b35a
Remove extra require
YashJipkate Jun 27, 2019
bcc91e4
Remove unnecessary change
YashJipkate Jun 27, 2019
6392862
Remove unnecessary change
YashJipkate Jun 27, 2019
68284a2
Review changes
YashJipkate Jun 27, 2019
4969816
Merge branch 'develop' into ang-oppia2
YashJipkate Jun 27, 2019
dead1eb
Merge
YashJipkate Jun 27, 2019
07f3a8c
Merge develop
YashJipkate Jun 28, 2019
770415c
Necessary changes
YashJipkate Jun 28, 2019
2cd898c
Have SHA512 in package-lock
YashJipkate Jun 29, 2019
f619d88
Merge develop
YashJipkate Jun 29, 2019
df9c77d
Update comment
YashJipkate Jun 29, 2019
a46ceb1
Update issues number
YashJipkate Jun 29, 2019
8ebf7b3
Empty commit
YashJipkate Jun 29, 2019
8cfc0f1
Merge branch 'develop' into ang-oppia2
YashJipkate Jun 29, 2019
415c36f
Fix tests
YashJipkate Jun 29, 2019
db39b96
Added sha512
YashJipkate Jun 29, 2019
6da3e3a
Merge branch 'develop' into ang-oppia2
YashJipkate Jun 29, 2019
5b8f21f
Fix minify plugins
YashJipkate Jun 30, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Prev Previous commit
Next Next commit
Review changes
  • Loading branch information
YashJipkate committed Jun 26, 2019
commit 099b051512d2c1fab6e487bb8e284f663e582034
2 changes: 1 addition & 1 deletion core/templates/dev/head/App.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ require('app.constants.ts');
// loaded after app.constants.ts
require('I18nFooter.ts');

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

oppia.config([
'$compileProvider', '$cookiesProvider', '$httpProvider',
Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/AppInit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ var oppia = angular.module(
].concat(
window.GLOBALS ? (window.GLOBALS.ADDITIONAL_ANGULAR_MODULES || []) : []));

exports.moduleName = oppia;
exports.module = oppia;
2 changes: 1 addition & 1 deletion core/templates/dev/head/I18nFooter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* @author milagro.teruel@gmail.com (Milagro Teruel)
*/

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

oppia.controller('I18nFooter', [
'$cookies', '$http', '$rootScope', '$scope', '$timeout', '$translate',
Expand Down
152 changes: 152 additions & 0 deletions core/templates/dev/head/app.constants.ajs.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
// Copyright 2019 The Oppia Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS-IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

/**
* @fileoverview Shared constants for the Oppia module.
*/

import { AppConstants } from 'app.constants.ts';

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

for (var constantName in constants) {
oppia.constant(constantName, constants[constantName]);
}

// Translations of strings that are loaded in the front page. They are listed
// here to be loaded synchronously with the script to prevent a FOUC or
// Flash of Untranslated Content.
// See http://angular-translate.github.io/docs/#/guide/12_asynchronous-loading
oppia.constant('DEFAULT_TRANSLATIONS', AppConstants.DEFAULT_TRANSLATIONS);

oppia.constant('RULE_SUMMARY_WRAP_CHARACTER_COUNT',
AppConstants.RULE_SUMMARY_WRAP_CHARACTER_COUNT);

/* Called always when learner moves to a new card.
Also called when card is selected by clicking on progress dots */
oppia.constant(
'EVENT_ACTIVE_CARD_CHANGED', AppConstants.EVENT_ACTIVE_CARD_CHANGED);
/* Called when the learner moves to a new card that they haven't seen before. */
oppia.constant('EVENT_NEW_CARD_OPENED', AppConstants.EVENT_NEW_CARD_AVAILABLE);
oppia.constant(
'EDITABLE_EXPLORATION_DATA_DRAFT_URL_TEMPLATE',
AppConstants.EDITABLE_EXPLORATION_DATA_DRAFT_URL_TEMPLATE);
oppia.constant(
'EDITABLE_EXPLORATION_DATA_URL_TEMPLATE',
AppConstants.EDITABLE_EXPLORATION_DATA_URL_TEMPLATE);
oppia.constant(
'EXPLORATION_DATA_URL_TEMPLATE',
AppConstants.EXPLORATION_DATA_URL_TEMPLATE);
oppia.constant(
'EXPLORATION_VERSION_DATA_URL_TEMPLATE',
AppConstants.EXPLORATION_VERSION_DATA_URL_TEMPLATE);
oppia.constant(
'VOICEOVER_EXPLORATION_DATA_URL_TEMPLATE',
AppConstants.VOICEOVER_EXPLORATION_DATA_URL_TEMPLATE);
/* New card is available but user hasn't gone to it yet (when oppia
gives a feedback and waits for user to press 'continue').
Not called when a card is selected by clicking progress dots */
oppia.constant(
'EVENT_NEW_CARD_AVAILABLE', AppConstants.EVENT_NEW_CARD_AVAILABLE);

oppia.constant('WARNING_TYPES', AppConstants.WARNING_TYPES);

oppia.constant('STATE_ERROR_MESSAGES', AppConstants.STATE_ERROR_MESSAGES);

oppia.constant(
'EXPLORATION_SUMMARY_DATA_URL_TEMPLATE',
AppConstants.EXPLORATION_SUMMARY_DATA_URL_TEMPLATE);

oppia.constant(
'EXPLORATION_AND_SKILL_ID_PATTERN',
AppConstants.EXPLORATION_AND_SKILL_ID_PATTERN);

// We use a slash because this character is forbidden in a state name.
oppia.constant(
'PLACEHOLDER_OUTCOME_DEST', AppConstants.PLACEHOLDER_OUTCOME_DEST);
oppia.constant(
'INTERACTION_DISPLAY_MODE_INLINE',
AppConstants.INTERACTION_DISPLAY_MODE_INLINE);
oppia.constant('LOADING_INDICATOR_URL', AppConstants.LOADING_INDICATOR_URL);
oppia.constant(
'OBJECT_EDITOR_URL_PREFIX', AppConstants.OBJECT_EDITOR_URL_PREFIX);
// Feature still in development.
// NOTE TO DEVELOPERS: This should be synchronized with the value in feconf.
oppia.constant('ENABLE_ML_CLASSIFIERS', AppConstants.ENABLE_ML_CLASSIFIERS);
// Feature still in development.
oppia.constant(
'INFO_MESSAGE_SOLUTION_IS_INVALID_FOR_EXPLORATION',
AppConstants.INFO_MESSAGE_SOLUTION_IS_INVALID_FOR_EXPLORATION);
oppia.constant('PARAMETER_TYPES', AppConstants.PARAMETER_TYPES);

// The maximum number of nodes to show in a row of the state graph.
oppia.constant('MAX_NODES_PER_ROW', AppConstants.MAX_NODES_PER_ROW);
// The following variable must be at least 3. It represents the maximum length,
// in characters, for the name of each node label in the state graph.
oppia.constant('MAX_NODE_LABEL_LENGTH', AppConstants.MAX_NODE_LABEL_LENGTH);

// If an $http request fails with the following error codes, a warning is
// displayed.
oppia.constant('FATAL_ERROR_CODES', AppConstants.FATAL_ERROR_CODES);

// Do not modify these, for backwards-compatibility reasons.
oppia.constant('COMPONENT_NAME_CONTENT', AppConstants.COMPONENT_NAME_CONTENT);
oppia.constant('COMPONENT_NAME_HINT', AppConstants.COMPONENT_NAME_HINT);
oppia.constant('COMPONENT_NAME_SOLUTION', AppConstants.COMPONENT_NAME_SOLUTION);
oppia.constant('COMPONENT_NAME_FEEDBACK', AppConstants.COMPONENT_NAME_FEEDBACK);
oppia.constant(
'COMPONENT_NAME_EXPLANATION', AppConstants.COMPONENT_NAME_EXPLANATION);
oppia.constant(
'COMPONENT_NAME_WORKED_EXAMPLE', AppConstants.COMPONENT_NAME_WORKED_EXAMPLE);

oppia.constant(
'ACTION_TYPE_EXPLORATION_START', AppConstants.ACTION_TYPE_EXPLORATION_START);
oppia.constant(
'ACTION_TYPE_ANSWER_SUBMIT', AppConstants.ACTION_TYPE_ANSWER_SUBMIT);
oppia.constant(
'ACTION_TYPE_EXPLORATION_QUIT', AppConstants.ACTION_TYPE_EXPLORATION_QUIT);

oppia.constant('ISSUE_TYPE_EARLY_QUIT', AppConstants.ISSUE_TYPE_EARLY_QUIT);
oppia.constant(
'ISSUE_TYPE_MULTIPLE_INCORRECT_SUBMISSIONS',
AppConstants.ISSUE_TYPE_MULTIPLE_INCORRECT_SUBMISSIONS);
oppia.constant(
'ISSUE_TYPE_CYCLIC_STATE_TRANSITIONS',
AppConstants.ISSUE_TYPE_CYCLIC_STATE_TRANSITIONS);
oppia.constant('SITE_NAME', AppConstants.SITE_NAME);

oppia.constant(
'DEFAULT_PROFILE_IMAGE_PATH', AppConstants.DEFAULT_PROFILE_IMAGE_PATH);

oppia.constant('LOGOUT_URL', AppConstants.LOGOUT_URL);

oppia.constant(
'EVENT_QUESTION_SUMMARIES_INITIALIZED',
AppConstants.EVENT_QUESTION_SUMMARIES_INITIALIZED);

// TODO(vojtechjelinek): Move these to separate file later, after we establish
// process to follow for Angular constants (#6731).
oppia.constant(
'SUBTOPIC_PAGE_EDITOR_DATA_URL_TEMPLATE',
AppConstants.SUBTOPIC_PAGE_EDITOR_DATA_URL_TEMPLATE);
oppia.constant(
'EDITABLE_TOPIC_DATA_URL_TEMPLATE',
AppConstants.EDITABLE_TOPIC_DATA_URL_TEMPLATE);

oppia.constant(
'LABEL_FOR_CLEARING_FOCUS', AppConstants.LABEL_FOR_CLEARING_FOCUS);

// TODO(bhenning): This constant should be provided by the backend.
oppia.constant(
'COLLECTION_DATA_URL_TEMPLATE', AppConstants.COLLECTION_DATA_URL_TEMPLATE);
2 changes: 1 addition & 1 deletion core/templates/dev/head/app.constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* @fileoverview Shared constants for the Oppia module.
*/

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

for (var constantName in constants) {
oppia.constant(constantName, constants[constantName]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require('pages/OppiaFooterDirective.ts');

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('baseContent', [
'UrlInterpolationService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('warningLoader', [
'UrlInterpolationService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ require('services/contextual/UrlService.ts');
require('services/SiteAnalyticsService.ts');
require('services/UserService.ts');

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

oppia.directive('createActivityButton', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('domain/utilities/UrlInterpolationService.ts');
require('services/SiteAnalyticsService.ts');

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

oppia.factory('ExplorationEmbedButtonService', [
'$uibModal', 'SiteAnalyticsService', 'UrlInterpolationService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require('services/contextual/DeviceInfoService.ts');

require('pages/exploration-player-page/exploration-player-page.constants.ts');

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

oppia.directive('hintAndSolutionButtons', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('socialButtons', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('services/ContextService.ts');
require('services/RteHelperService.ts');

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

oppia.directive('ckEditorRte', [
'ContextService', 'RteHelperService', 'PAGE_CONTEXT',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require('rich_text_components/richTextComponentsRequires.ts');
require('services/HtmlEscaperService.ts');
require('services/RteHelperService.ts');

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

oppia.run([
'$timeout', '$compile', '$rootScope', '$uibModal', 'RteHelperService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('services/AlertsService.ts');

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

oppia.directive('alertMessage', [function() {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('domain/utilities/BrowserCheckerService.ts');
require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('attributionGuide', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('backgroundBanner', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('loadingDots', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
require('domain/utilities/UrlInterpolationService.ts');
require('services/PromoBarService.ts');

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

oppia.directive('promoBar', [
'$window', 'PromoBarService', 'UrlInterpolationService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require('domain/utilities/UrlInterpolationService.ts');
require('services/HtmlEscaperService.ts');
require('services/SiteAnalyticsService.ts');

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

oppia.directive('sharingLinks', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.directive('sideNavigationBar', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require('services/UserService.ts');
require('services/contextual/DeviceInfoService.ts');
require('services/contextual/WindowDimensionsService.ts');

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

oppia.directive('topNavigationBar', [
'UrlInterpolationService', function(UrlInterpolationService) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require('services/SiteAnalyticsService.ts');
// duplicated code between CollectionCreationService and
// ExplorationCreationService.

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

oppia.factory('CollectionCreationService', [
'$http', '$rootScope', '$timeout', '$window', 'AlertsService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require('domain/utilities/UrlInterpolationService.ts');
require('services/AlertsService.ts');
require('services/SiteAnalyticsService.ts');

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

oppia.factory('ExplorationCreationService', [
'$http', '$rootScope', '$timeout', '$uibModal', '$window',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

require('domain/utilities/UrlInterpolationService.ts');

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

oppia.factory('QuestionCreationService', [
'$http', '$q', 'UrlInterpolationService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('domain/utilities/UrlInterpolationService.ts');
require('services/AlertsService.ts');

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

oppia.factory('SkillCreationService', [
'$http', '$rootScope', '$timeout', '$window', 'AlertsService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require('domain/utilities/UrlInterpolationService.ts');
require('pages/topic-editor-page/services/topic-editor-state.service.ts');
require('services/AlertsService.ts');

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

oppia.factory('StoryCreationService', [
'$http', '$rootScope', '$timeout', '$uibModal', '$window', 'AlertsService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('domain/utilities/UrlInterpolationService.ts');
require('services/AlertsService.ts');

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

oppia.factory('TopicCreationService', [
'$http', '$rootScope', '$timeout', '$uibModal', '$window', 'AlertsService',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
require('filters/string-utility-filters/underscores-to-camel-case.filter.ts');

/* eslint-disable angular/directive-restrict */
var oppia = require('AppInit.ts').moduleName;
var oppia = require('AppInit.ts').module;

oppia.directive('applyValidation', ['$filter', function($filter) {
return {
Expand Down
Loading