Skip to content

Commit

Permalink
Fix part of issue oppia#6316: Remove some scripts from base.html whic…
Browse files Browse the repository at this point in the history
…h were not needed in it. (oppia#6466)

* remove RteHelperService

* remove HtmlEscaperService

* fix tests issue

* remove IdGenerationService from base.html

* fix issues

* fix tests

* fixes tests issue
  • Loading branch information
import-keshav authored and nithusha21 committed Mar 24, 2019
1 parent bff3e00 commit 3d186e4
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 3 deletions.
3 changes: 0 additions & 3 deletions core/templates/dev/head/pages/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,7 @@ <h2>
<script src="/templates/dev/head/services/UtilsService.js"></script>
<script src="/templates/dev/head/services/DebouncerService.js"></script>
<script src="/templates/dev/head/services/DateTimeFormatService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/TranslationFileHashLoaderService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/UserService.js"></script>
<script src="/templates/dev/head/services/PromoBarService.js"></script>
<script src="/templates/dev/head/services/contextual/DeviceInfoService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@
<script src="/templates/dev/head/services/ExplorationHtmlFormatterService.js"></script>
<script src="/templates/dev/head/services/ExtensionTagAssemblerService.js"></script>
<script src="/templates/dev/head/services/GenerateContentIdService.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/LocalStorageService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
<script src="/templates/dev/head/services/ValidatorsService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -409,5 +409,6 @@ <h2 ng-if="collectionPlaythrough.hasFinishedCollection()" class="oppia-page-head

<script src="/templates/dev/head/components/summary_tile/ExplorationSummaryTileDirective.js"></script>
<script src="/templates/dev/head/components/summary_tile/CircularImageDirective.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
{% endblock footer_js %}
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ <h2>Suggestions to review</h2>
<script src="/templates/dev/head/services/MessengerService.js"></script>
<script src="/templates/dev/head/services/AudioPlayerService.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/AutogeneratedAudioPlayerService.js"></script>
<script src="/templates/dev/head/services/SpeechSynthesisChunkerService.js"></script>
<script src="/templates/dev/head/services/CodeNormalizerService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,15 @@
<script src="/templates/dev/head/services/ExtensionTagAssemblerService.js"></script>
<script src="/templates/dev/head/services/GenerateContentIdService.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/ImprovementsService.js"></script>
<script src="/templates/dev/head/services/LocalStorageService.js"></script>
<script src="/templates/dev/head/services/MessengerService.js"></script>
<script src="/templates/dev/head/services/NestedDirectivesRecursionTimeoutPreventionService.js"></script>
<script src="/templates/dev/head/services/PlaythroughIssuesBackendApiService.js"></script>
<script src="/templates/dev/head/services/PlaythroughIssuesService.js"></script>
<script src="/templates/dev/head/services/PlaythroughService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
<script src="/templates/dev/head/services/SchemaUndefinedLastElementService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,13 @@ <h1 class="oppia-exploration-h1"><span class="protractor-test-exploration-header
<script src="/templates/dev/head/services/ExtensionTagAssemblerService.js"></script>
<script src="/templates/dev/head/services/GenerateContentIdService.js"></script>
<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/MessengerService.js"></script>
<script src="/templates/dev/head/services/NestedDirectivesRecursionTimeoutPreventionService.js"></script>
<script src="/templates/dev/head/services/PlaythroughIssuesBackendApiService.js"></script>
<script src="/templates/dev/head/services/PlaythroughIssuesService.js"></script>
<script src="/templates/dev/head/services/PlaythroughService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
<script src="/templates/dev/head/services/SchemaUndefinedLastElementService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1187,6 +1187,8 @@ <h1 class="stat-value"><[subscriptionsList.length]></h1>
<script src="/templates/dev/head/components/RatingComputationService.js"></script>
<script src="/templates/dev/head/components/loading/LoadingDotsDirective.js"></script>

<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>

<script src="/templates/dev/head/domain/feedback_thread/FeedbackThreadSummaryObjectFactory.js"></script>
<script src="/templates/dev/head/domain/feedback_message/FeedbackMessageSummaryObjectFactory.js"></script>
<script src="/templates/dev/head/pages/exploration_editor/feedback_tab/ThreadStatusDisplayService.js"></script>
Expand Down
1 change: 1 addition & 0 deletions core/templates/dev/head/pages/library/library.html
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@ <h2 ng-class="{'active': activeGroupIndex === $index}" class="oppia-library-grou
<script src="/templates/dev/head/filters/TruncateFilter.js"></script>
<script src="/templates/dev/head/filters/TruncateAndCapitalizeFilter.js"></script>

<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/NavigationService.js"></script>
<script src="/templates/dev/head/services/SearchService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions core/templates/dev/head/pages/moderator/moderator.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ <h3>Activities to feature in the library</h3>
<script src="/templates/dev/head/components/forms/RequireIsFloatDirective.js"></script>
<script src="/templates/dev/head/filters/UnderscoresToCamelCaseFilter.js"></script>

<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
<script src="/templates/dev/head/services/SchemaUndefinedLastElementService.js"></script>
<script src="/templates/dev/head/services/NestedDirectivesRecursionTimeoutPreventionService.js"></script>
Expand Down
2 changes: 2 additions & 0 deletions core/templates/dev/head/pages/preferences/preferences.html
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,6 @@
<script src="/templates/dev/head/domain/utilities/AutogeneratedAudioLanguageObjectFactory.js"></script>
<script src="/templates/dev/head/domain/utilities/BrowserCheckerService.js"></script>
<script src="/templates/dev/head/domain/utilities/LanguageUtilService.js"></script>

<script src="/templates/dev/head/services/IdGenerationService.js"></script>
{% endblock footer_js %}
1 change: 1 addition & 0 deletions core/templates/dev/head/pages/signup/signup.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,5 +114,6 @@ <h2 class="oppia-signup-page-title" translate="I18N_SIGNUP_COMPLETE_REGISTRATION
{% block footer_js %}
{{ super() }}
<script src="/templates/dev/head/pages/signup/Signup.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>
{% endblock footer_js %}
3 changes: 3 additions & 0 deletions core/templates/dev/head/pages/skill_editor/skill_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
<script src="/extensions/objects/templates/SetOfUnicodeStringEditorDirective.js"></script>
<script src="/extensions/objects/templates/UnicodeStringEditorDirective.js"></script>

<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
<script src="/templates/dev/head/services/SchemaUndefinedLastElementService.js"></script>
<script src="/templates/dev/head/services/NestedDirectivesRecursionTimeoutPreventionService.js"></script>
Expand Down
3 changes: 3 additions & 0 deletions core/templates/dev/head/pages/story_editor/story_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,9 @@
<script src="/extensions/objects/templates/SanitizedUrlEditorDirective.js"></script>
<script src="/extensions/objects/templates/ListOfTabsEditorDirective.js"></script>

<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
<script src="/templates/dev/head/services/SchemaUndefinedLastElementService.js"></script>
<script src="/templates/dev/head/services/NestedDirectivesRecursionTimeoutPreventionService.js"></script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,7 @@ <h5><[form.name]></h5>
<script src="/templates/dev/head/components/forms/schema_viewers/SchemaBasedUnicodeViewerDirective.js"></script>
<script src="/templates/dev/head/components/forms/schema_viewers/SchemaBasedViewerDirective.js"></script>

<script src="/templates/dev/head/services/HtmlEscaperService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
{% endblock footer_js %}
2 changes: 2 additions & 0 deletions core/templates/dev/head/pages/topic_editor/topic_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@
<script src="/templates/dev/head/services/GenerateContentIdService.js"></script>
<script src="/templates/dev/head/services/ImprovementsService.js"></script>
<script src="/templates/dev/head/services/LocalStorageService.js"></script>
<script src="/templates/dev/head/services/RteHelperService.js"></script>
<script src="/templates/dev/head/services/SiteAnalyticsService.js"></script>

<script src="/templates/dev/head/services/SchemaDefaultValueService.js"></script>
Expand All @@ -163,6 +164,7 @@
<script src="/templates/dev/head/domain/editor/undo_redo/BaseUndoRedoService.js"></script>

<script src="/templates/dev/head/services/AssetsBackendApiService.js"></script>
<script src="/templates/dev/head/services/IdGenerationService.js"></script>
<script src="/templates/dev/head/services/StateTopAnswersStatsBackendApiService.js"></script>
<script src="/templates/dev/head/domain/classifier/AnswerClassificationResultObjectFactory.js"></script>
<script src="/templates/dev/head/domain/classifier/ClassifierObjectFactory.js"></script>
Expand Down

0 comments on commit 3d186e4

Please sign in to comment.