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

Fix code duplication in ExplorationPlayerStateService #6000

Merged
merged 45 commits into from
Dec 20, 2018
Merged

Fix code duplication in ExplorationPlayerStateService #6000

Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
c9d4d22
Fix hola's multiple choice question.
brianrodri Aug 11, 2018
9b16504
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Aug 12, 2018
80cf6c9
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Aug 12, 2018
1904b2d
Merge branch 'develop' of https://github.com/brianrodri/oppia into de…
brianrodri Aug 15, 2018
1d21cf8
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 5, 2018
0d41226
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 6, 2018
cbd7666
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 8, 2018
8db0992
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 15, 2018
18658de
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 23, 2018
bca45b2
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Sep 23, 2018
d956212
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 15, 2018
67bf6e2
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 18, 2018
afc36e2
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 20, 2018
926a925
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 22, 2018
bfb2fb7
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 29, 2018
e4efd3e
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Oct 30, 2018
0478611
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Nov 5, 2018
0899b3a
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Nov 22, 2018
0e690ef
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Nov 27, 2018
050f37f
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 2, 2018
37aef06
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 6, 2018
c18d79c
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 6, 2018
1cd3750
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 6, 2018
005ce4d
Merge branch 'develop' of https://github.com/brianrodri/oppia into de…
brianrodri Dec 7, 2018
139112d
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 7, 2018
e57222b
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 14, 2018
edb3aeb
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 15, 2018
fcaa078
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 16, 2018
3e3313f
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 17, 2018
4e6c15a
Merge remote-tracking branch 'upstream/develop' into develop
brianrodri Dec 18, 2018
57db5b3
initial commit
brianrodri Dec 18, 2018
92c10cc
cleaner ternary if
brianrodri Dec 18, 2018
3cb4aa3
sort imports
brianrodri Dec 18, 2018
62ed2c3
condense args
brianrodri Dec 18, 2018
6f5f883
more vertical spacing
brianrodri Dec 18, 2018
2714e7c
prefer Promise over
brianrodri Dec 18, 2018
f0c1feb
cleanup into helper functions
brianrodri Dec 18, 2018
5d39f34
better name
brianrodri Dec 18, 2018
0f8554e
pass in callback
brianrodri Dec 18, 2018
588ef83
use ternary if
brianrodri Dec 18, 2018
3996691
fix lint errors
brianrodri Dec 18, 2018
d1a346a
s/allData/combinedData
brianrodri Dec 19, 2018
8c68aee
move init function to top
brianrodri Dec 19, 2018
9f1529f
s/IssuesService/ImprovementsService
brianrodri Dec 19, 2018
e405c8e
Revert "s/IssuesService/ImprovementsService"
brianrodri Dec 19, 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
Prev Previous commit
Next Next commit
sort imports
  • Loading branch information
@brianrodri
brianrodri committed Dec 18, 2018
commit 3cb4aa3e969cf496281d76c0d23351c32e62bc59
28 changes: 14 additions & 14 deletions core/templates/dev/head/pages/exploration_player/ExplorationPlayerStateService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,21 @@
*/

oppia.factory('ExplorationPlayerStateService', [
'$log', '$q', 'ExplorationEngineService', 'PretestEngineService',
'ContextService', 'UrlService', 'StateClassifierMappingService',
'StatsReportingService', 'PlaythroughService', 'PlaythroughIssuesService',
'PlayerCorrectnessFeedbackEnabledService', 'PlayerTranscriptService',
'EditableExplorationBackendApiService', 'PlayerPositionService',
'ReadOnlyExplorationBackendApiService', 'PretestQuestionBackendApiService',
'NumberAttemptsService',
'$log', '$q', 'ContextService', 'EditableExplorationBackendApiService',
'ExplorationEngineService', 'NumberAttemptsService',
'PlayerCorrectnessFeedbackEnabledService', 'PlayerPositionService',
'PlayerTranscriptService', 'PlaythroughIssuesService', 'PlaythroughService',
'PretestEngineService', 'PretestQuestionBackendApiService',
'ReadOnlyExplorationBackendApiService', 'StateClassifierMappingService',
'StatsReportingService', 'UrlService',
function(
$log, $q, ExplorationEngineService, PretestEngineService,
ContextService, UrlService, StateClassifierMappingService,
StatsReportingService, PlaythroughService, PlaythroughIssuesService,
PlayerCorrectnessFeedbackEnabledService, PlayerTranscriptService,
EditableExplorationBackendApiService, PlayerPositionService,
ReadOnlyExplorationBackendApiService, PretestQuestionBackendApiService,
NumberAttemptsService) {
$log, $q, ContextService, EditableExplorationBackendApiService,
ExplorationEngineService, NumberAttemptsService,
PlayerCorrectnessFeedbackEnabledService, PlayerPositionService,
PlayerTranscriptService, PlaythroughIssuesService, PlaythroughService,
PretestEngineService, PretestQuestionBackendApiService,
ReadOnlyExplorationBackendApiService, StateClassifierMappingService,
StatsReportingService, UrlService) {
var currentEngineService = null;
var inPretestMode = false;
var editorPreviewMode = ContextService.isInExplorationEditorPage();
Expand Down