Skip to content

Commit de19b38

Browse files
author
Vanshika
committed
Fix #5251: Remove unnecessary startup delay
Removed the setTimeout(5000) that was delaying UI initialization. The domReady callback already ensures DOM is loaded, so the extra delay was causing poor UX with 5+ second wait times. Now the app initializes immediately when DOM is ready. Tested with npm test - all suites pass.
1 parent 57b1738 commit de19b38

File tree

1 file changed

+47
-51
lines changed

1 file changed

+47
-51
lines changed

‎js/activity.js‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@ class Activity {
20542054
const changeText = () => {
20552055
const randomLoadMessage =
20562056
messages.load_messages[
2057-
Math.floor(Math.random() * messages.load_messages.length)
2057+
Math.floor(Math.random() * messages.load_messages.length)
20582058
];
20592059
document.getElementById("messageText").innerHTML = randomLoadMessage + "...";
20602060
counter++;
@@ -2998,11 +2998,11 @@ class Activity {
29982998
.data("item.autocomplete", item)
29992999
.append(
30003000
'<img src="' +
3001-
item.artwork +
3002-
'" height="20px">' +
3003-
"<a> " +
3004-
item.label +
3005-
"</a>"
3001+
item.artwork +
3002+
'" height="20px">' +
3003+
"<a> " +
3004+
item.label +
3005+
"</a>"
30063006
)
30073007
.appendTo(
30083008
ul.css({
@@ -4348,8 +4348,8 @@ class Activity {
43484348
console.log(
43494349
"%cMusic Blocks",
43504350
"font-size: 24px; font-weight: bold; font-family: sans-serif; padding:20px 0 0 110px; background: url(" +
4351-
imgUrl +
4352-
") no-repeat;"
4351+
imgUrl +
4352+
") no-repeat;"
43534353
);
43544354
// eslint-disable-next-line no-console
43554355
console.log(
@@ -4421,10 +4421,10 @@ class Activity {
44214421
typeof flags !== "undefined"
44224422
? flags
44234423
: {
4424-
run: false,
4425-
show: false,
4426-
collapse: false
4427-
};
4424+
run: false,
4425+
show: false,
4426+
collapse: false
4427+
};
44284428
this.loading = true;
44294429
document.body.style.cursor = "wait";
44304430
this.doLoadAnimation();
@@ -4787,9 +4787,8 @@ class Activity {
47874787
[
47884788
"nameddo",
47894789
{
4790-
value: `V: ${parseInt(lineId) + 1} Line ${
4791-
staffBlocksMap[lineId]?.baseBlocks?.length + 1
4792-
}`
4790+
value: `V: ${parseInt(lineId) + 1} Line ${staffBlocksMap[lineId]?.baseBlocks?.length + 1
4791+
}`
47934792
}
47944793
],
47954794
0,
@@ -4798,12 +4797,12 @@ class Activity {
47984797
staffBlocksMap[lineId].baseBlocks.length === 0
47994798
? null
48004799
: staffBlocksMap[lineId].baseBlocks[
4801-
staffBlocksMap[lineId].baseBlocks.length - 1
4802-
][0][
4803-
staffBlocksMap[lineId].baseBlocks[
4804-
staffBlocksMap[lineId].baseBlocks.length - 1
4805-
][0].length - 4
4806-
][0],
4800+
staffBlocksMap[lineId].baseBlocks.length - 1
4801+
][0][
4802+
staffBlocksMap[lineId].baseBlocks[
4803+
staffBlocksMap[lineId].baseBlocks.length - 1
4804+
][0].length - 4
4805+
][0],
48074806
null
48084807
]
48094808
],
@@ -4819,9 +4818,8 @@ class Activity {
48194818
[
48204819
"text",
48214820
{
4822-
value: `V: ${parseInt(lineId) + 1} Line ${
4823-
staffBlocksMap[lineId]?.baseBlocks?.length + 1
4824-
}`
4821+
value: `V: ${parseInt(lineId) + 1} Line ${staffBlocksMap[lineId]?.baseBlocks?.length + 1
4822+
}`
48254823
}
48264824
],
48274825
0,
@@ -4856,14 +4854,14 @@ class Activity {
48564854
staffBlocksMap[staffIndex].startBlock.length - 3
48574855
][4][2] =
48584856
staffBlocksMap[staffIndex].baseBlocks[0][0][
4859-
staffBlocksMap[staffIndex].baseBlocks[0][0].length - 4
4857+
staffBlocksMap[staffIndex].baseBlocks[0][0].length - 4
48604858
][0];
48614859
// Update the first namedo block with settimbre
48624860
staffBlocksMap[staffIndex].baseBlocks[0][0][
48634861
staffBlocksMap[staffIndex].baseBlocks[0][0].length - 4
48644862
][4][0] =
48654863
staffBlocksMap[staffIndex].startBlock[
4866-
staffBlocksMap[staffIndex].startBlock.length - 3
4864+
staffBlocksMap[staffIndex].startBlock.length - 3
48674865
][0];
48684866
const repeatblockids = staffBlocksMap[staffIndex].repeatArray;
48694867
for (const repeatId of repeatblockids) {
@@ -4875,7 +4873,7 @@ class Activity {
48754873
0,
48764874
[
48774875
staffBlocksMap[staffIndex].startBlock[
4878-
staffBlocksMap[staffIndex].startBlock.length - 3
4876+
staffBlocksMap[staffIndex].startBlock.length - 3
48794877
][0] /*setribmre*/,
48804878
blockId + 1,
48814879
staffBlocksMap[staffIndex].nameddoArray[staffIndex][0],
@@ -4884,8 +4882,8 @@ class Activity {
48844882
] === null
48854883
? null
48864884
: staffBlocksMap[staffIndex].nameddoArray[staffIndex][
4887-
repeatId.end + 1
4888-
]
4885+
repeatId.end + 1
4886+
]
48894887
]
48904888
]);
48914889
staffBlocksMap[staffIndex].repeatBlock.push([
@@ -4919,7 +4917,7 @@ class Activity {
49194917
const secondnammedo = _searchIndexForMusicBlock(
49204918
staffBlocksMap[staffIndex].baseBlocks[repeatId.end + 1][0],
49214919
staffBlocksMap[staffIndex].nameddoArray[staffIndex][
4922-
repeatId.end + 1
4920+
repeatId.end + 1
49234921
]
49244922
);
49254923

@@ -4943,31 +4941,31 @@ class Activity {
49434941
const prevnameddo = _searchIndexForMusicBlock(
49444942
staffBlocksMap[staffIndex].baseBlocks[repeatId.start - 1][0],
49454943
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4946-
currentnammeddo
4944+
currentnammeddo
49474945
][4][0]
49484946
);
49494947
const afternamedo = _searchIndexForMusicBlock(
49504948
staffBlocksMap[staffIndex].baseBlocks[repeatId.end][0],
49514949
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4952-
currentnammeddo
4950+
currentnammeddo
49534951
][4][1]
49544952
);
49554953
let prevrepeatnameddo = -1;
49564954
if (prevnameddo === -1) {
49574955
prevrepeatnameddo = _searchIndexForMusicBlock(
49584956
staffBlocksMap[staffIndex].repeatBlock,
49594957
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4960-
currentnammeddo
4958+
currentnammeddo
49614959
][4][0]
49624960
);
49634961
}
49644962
const prevBlockId =
49654963
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4966-
currentnammeddo
4964+
currentnammeddo
49674965
][4][0];
49684966
const currentBlockId =
49694967
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4970-
currentnammeddo
4968+
currentnammeddo
49714969
][0];
49724970

49734971
// Needs null checking optmizie
@@ -4981,7 +4979,7 @@ class Activity {
49814979
0,
49824980
[
49834981
staffBlocksMap[staffIndex].baseBlocks[repeatId.start][0][
4984-
currentnammeddo
4982+
currentnammeddo
49854983
][4][0],
49864984
blockId + 1,
49874985
currentBlockId,
@@ -5597,7 +5595,7 @@ class Activity {
55975595
this.update = true;
55985596
};
55995597

5600-
this.__showAltoAccidentals = () => {};
5598+
this.__showAltoAccidentals = () => { };
56015599

56025600
/*
56035601
* Shows musical alto staff
@@ -6264,12 +6262,12 @@ class Activity {
62646262
.data("item.autocomplete", item)
62656263
.append(
62666264
'<img src="' +
6267-
item.artwork +
6268-
'" height = "20px">' +
6269-
"<a>" +
6270-
" " +
6271-
item.label +
6272-
"</a>"
6265+
item.artwork +
6266+
'" height = "20px">' +
6267+
"<a>" +
6268+
" " +
6269+
item.label +
6270+
"</a>"
62736271
)
62746272
.appendTo(ul.css("z-index", 9999));
62756273
};
@@ -6384,10 +6382,10 @@ class Activity {
63846382
container.setAttribute(
63856383
"style",
63866384
"position: absolute; right:" +
6387-
(document.body.clientWidth - x) +
6388-
"px; top: " +
6389-
y +
6390-
"px;"
6385+
(document.body.clientWidth - x) +
6386+
"px; top: " +
6387+
y +
6388+
"px;"
63916389
);
63926390
document.getElementById("buttoncontainerBOTTOM").appendChild(container);
63936391
return container;
@@ -7685,10 +7683,8 @@ class Activity {
76857683
const activity = new Activity();
76867684

76877685
require(["domReady!"], doc => {
7688-
setTimeout(() => {
7689-
activity.setupDependencies();
7690-
activity.domReady(doc);
7691-
}, 5000);
7686+
activity.setupDependencies();
7687+
activity.domReady(doc);
76927688
});
76937689

76947690
define(MYDEFINES, () => {

0 commit comments

Comments
 (0)