Skip to content

Commit 5c2a82a

Browse files
authored
Merge pull request #2129 from AlinLob/fix/save-standard-sound
save-standard-sound-in-setting
2 parents 0704fdd + 66c5a95 commit 5c2a82a

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

services/app/apps/codebattle/assets/js/__tests__/UserSettings.test.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const preloadedState = {
2424
user: {
2525
settings: {
2626
soundSettings: {
27-
type: 'standart',
27+
type: 'standard',
2828
level: 6,
2929
},
3030
id: 11,
@@ -100,7 +100,7 @@ describe('UserSettings test cases', () => {
100100
lang: 'js',
101101
sound_settings: {
102102
level: 6,
103-
type: 'standart',
103+
type: 'standard',
104104
},
105105
},
106106
expect.anything(),

services/app/apps/codebattle/assets/js/widgets/config/sound/standart.js renamed to services/app/apps/codebattle/assets/js/widgets/config/sound/standard.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
export default {
2-
src: '/assets/audio/audioSprites/standartSpritesAudio.wav',
2+
src: '/assets/audio/audioSprites/standardSpritesAudio.wav',
33
sprite: {
44
check: [0, 11000],
55
give_up: [12000, 486.6893424036274],

services/app/apps/codebattle/assets/js/widgets/lib/sound.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ import isUndefined from 'lodash/isUndefined';
44

55
import cs from '../config/sound/cs';
66
import dendy from '../config/sound/dendy';
7-
import standart from '../config/sound/standart';
7+
import standard from '../config/sound/standard';
88

99
const audioPaths = {
10-
standart: '/assets/audio/audioSprites/standartSpritesAudio.wav',
10+
standard: '/assets/audio/audioSprites/standardSpritesAudio.wav',
1111
cs: '/assets/audio/audioSprites/csSpritesAudio.wav',
1212
dendy: '/assets/audio/audioSprites/dendySpritesAudio.wav',
1313
silent: '',
1414
};
1515

1616
const audioConfigs = {
17-
standart,
17+
standard,
1818
cs,
1919
dendy,
2020
silent: {},
@@ -54,7 +54,7 @@ const createSound = slug => ({
5454
const createPlayer = () => ({
5555
dendy: createSound('dendy'),
5656
cs: createSound('cs'),
57-
standart: createSound('standart'),
57+
standard: createSound('standard'),
5858
silent: null,
5959
stop: () => Howler.stop(),
6060
});

services/app/apps/codebattle/assets/js/widgets/pages/settings/UserSettingsForm.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,9 +162,9 @@ const UserSettingsForm = ({ onSubmit, settings }) => {
162162
id="radioStandard"
163163
type="radio"
164164
name="soundSettings.type"
165-
value="standart"
165+
value="standard"
166166
className="form-check-input"
167-
onClick={() => playSound('standart', values.soundSettings.level * 0.1)}
167+
onClick={() => playSound('standard', values.soundSettings.level * 0.1)}
168168
/>
169169
<label className="form-check-label" htmlFor="radioStandard">Standard</label>
170170
</div>

services/app/apps/codebattle/assets/static/audio/audioSprites/standartSpritesAudio.json renamed to services/app/apps/codebattle/assets/static/audio/audioSprites/standardSpritesAudio.json

File renamed without changes.

services/app/apps/codebattle/assets/static/audio/audioSprites/standartSpritesAudio.wav renamed to services/app/apps/codebattle/assets/static/audio/audioSprites/standardSpritesAudio.wav

File renamed without changes.

0 commit comments

Comments
 (0)