Skip to content

Sync Master #384

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

Merged
nathanvercaemert merged 4 commits into from
May 13, 2026
Merged

Sync Master #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
650c3c4
Minor changes
patricksptang May 5, 2026
854dac3
Update error message
patricksptang May 5, 2026
5e1da47
Merge pull request #377 from STEPBible/pattest4
patricksptang May 5, 2026
e2c1bd6
Version 26.6.2
patricksptang May 5, 2026
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
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
<packaging>pom</packaging>
<name>STEP :: Scripture Tools for Every pastor</name>

Expand Down
2 changes: 1 addition & 1 deletion step-assembly/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>step-mvn</artifactId>
<groupId>com.tyndalehouse.step</groupId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion step-build/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<artifactId>step-build</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion step-core-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<artifactId>step-core-data</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion step-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-packages/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion step-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-war-precompiled/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>step-mvn</artifactId>
<groupId>com.tyndalehouse.step</groupId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion step-web-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<groupId>com.tyndalehouse.step</groupId>
Expand Down
2 changes: 1 addition & 1 deletion step-web/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tyndalehouse.step</groupId>
<artifactId>step-mvn</artifactId>
<version>26.5.1</version>
<version>26.5.2</version>
</parent>

<artifactId>step-web</artifactId>
Expand Down
48 changes: 24 additions & 24 deletions step-web/src/main/webapp/js/step_ready.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@
var deletedCount = 0;
for (var j = sortedIndex.length - 1; j > 0; j--) {
if ((sortedIndex[j] < 0) || (sortedIndex[j] >= step.bookmarks.length)) {
console.log("The sorted history index is wrong!")
console.log("The sorted history index is wrong: " + sortedIndex[j]);
continue; // index is wrong, skip it to avoid an exception
}
var histItem = step.bookmarks.models[sortedIndex[j]];
Expand All @@ -354,7 +354,7 @@
histItem.destroy();
deletedCount ++
}
if (deletedCount > 19)
if (deletedCount > 19) // Delete 20 at a time.
break;
}
}
Expand Down Expand Up @@ -469,29 +469,29 @@
var historyOfReferencesIndex = 0;
for (var histIndex = 0; histIndex < history.length; histIndex ++) {
var histItem = history.at(histIndex);
if ((typeof histItem === "object") &&
(typeof histItem.get === "function")) {
var histItemLastAccess = histItem.get("lastAccessed");
if (typeof histItemLastAccess !== "number")
continue;
if (historyOfReferencesIndex == 0) { // insertion sort should be quite efficient because the history is usually sorted already.
sortedHistoryTimeStamps[0] = histItemLastAccess;
sortedHistoryIndexes[0] = histIndex;
}
else { // part of the insertion sort
var j = historyOfReferencesIndex - 1;
while (j > -1 && sortedHistoryTimeStamps[j] < histItemLastAccess) {
sortedHistoryTimeStamps[j + 1] = sortedHistoryTimeStamps[j];
sortedHistoryIndexes[j + 1] = sortedHistoryIndexes[j];
j = j - 1;
}
sortedHistoryTimeStamps[j + 1] = histItemLastAccess;
sortedHistoryIndexes[j + 1] = histIndex;
if ((typeof histItem !== "object") ||
(typeof histItem.get !== "function"))
continue;
var histItemLastAccess = histItem.get("lastAccessed");
if (typeof histItemLastAccess !== "number")
continue;
if (historyOfReferencesIndex == 0) { // 1st part of insertion sort should be quite efficient because the history is usually sorted already.
sortedHistoryTimeStamps[0] = histItemLastAccess;
sortedHistoryIndexes[0] = histIndex;
}
else { // 2nd part of the insertion sort
var j = historyOfReferencesIndex - 1;
while (j > -1 && sortedHistoryTimeStamps[j] < histItemLastAccess) {
sortedHistoryTimeStamps[j + 1] = sortedHistoryTimeStamps[j];
sortedHistoryIndexes[j + 1] = sortedHistoryIndexes[j];
j = j - 1;
}
historyOfReferencesIndex ++;
sortedHistoryTimeStamps[j + 1] = histItemLastAccess;
sortedHistoryIndexes[j + 1] = histIndex;
}
historyOfReferencesIndex ++;
}
sortedHistoryIndexes.length = historyOfReferencesIndex;
sortedHistoryIndexes.length = historyOfReferencesIndex; // if size of array has changed, update size
return sortedHistoryIndexes;
}
function checkForExampleURL() {
Expand Down Expand Up @@ -559,7 +559,7 @@
var mostRecentPassage = "";
for (var i = 0; i < sortedIndex.length && mostRecentPassage === ""; i++) {
if ((sortedIndex[i] < 0) || (sortedIndex[i] >= history.length)) {
console.log("The sorted history index is wrong!")
console.log("The sorted history index is wrong: " + sortedIndex[i]);
continue; // index is wrong, skip it to avoid an exception
}
var histItem = history.at(sortedIndex[i]);
Expand Down Expand Up @@ -599,7 +599,7 @@
var histItemDisplay = histItem.get("display") || "";
if ((typeof histItemOptions === "string") && (typeof histItemDisplay === "string")) {
step.router.doMasterSearch(version + URL_SEPARATOR + query, histItemOptions, histItemDisplay);
break; // break from for loop. This line should not be necessary because doMasterSearch should not return. Just in case it returns.
break; // break from for loop
}
}
}
Expand Down
Loading