zaphar/dynamicbible
1
0
Fork 0
mirror of https://gitlab.com/walljm/dynamicbible.git synced 2025-07-27 01:19:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

CLEANUP: More vars to lets, type checking

Browse Source
This commit is contained in:
jason.wall 2016-04-26 10:30:37 -04:00
parent 1f2383d2f8
commit 05e3801666
12 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
DynamicBibleUtility/DynamicBibleApp/js/Util.js
View File

@ -23,7 +23,6 @@ var Util = (function () {
t.find(".removeresult").click(function (e) { t.find(".removeresult").click(function (e) {
self.RemoveResult(e); self.RemoveResult(e);
}); });
return false;
}; };
Util.GetUrlVars = function () { Util.GetUrlVars = function () {
// Read a page's GET URL variables and return them as an associative array. // Read a page's GET URL variables and return them as an associative array.

2
DynamicBibleUtility/DynamicBibleApp/js/Util.js.map
View File

@ -1 +1 @@
{"version":3,"file":"Util.js","sourceRoot":"","sources":["../ts/Util.ts"],"names":[],"mappings":"AAAA;IAAA;IAwCA,CAAC;IAvCiB,eAAU,GAAxB,UAAyB,CAAQ;QAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,qBAAgB,GAA9B,UAA+B,CAAQ;QACnC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,iBAAY,GAA1B,UAA2B,CAAQ;QAC/B,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACpG,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,gBAAW,GAAzB,UAA0B,CAAC;QACvB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,+DAA+D;QAC/D,IAAI,CAAC,GAAG,CAAC,CAAC,8MAA8M,GAAG,CAAC,GAAG,iCAAiC,CAAC,CAAC;QAClQ,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC;IACjB,CAAC;IAEa,eAAU,GAAxB;QACI,2EAA2E;QAC3E,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,CAAC;QACpB,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1F,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IACL,WAAC;AAAD,CAAC,AAxCD,IAwCC;AAAA,CAAC"} {"version":3,"file":"Util.js","sourceRoot":"","sources":["../ts/Util.ts"],"names":[],"mappings":"AAAA;IAAA;IAuCA,CAAC;IAtCiB,eAAU,GAAxB,UAAyB,CAAQ;QAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3B,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,qBAAgB,GAA9B,UAA+B,CAAQ;QACnC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAChD,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,iBAAY,GAA1B,UAA2B,CAAQ;QAC/B,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACpG,OAAO,iBAAiB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC;QACvC,QAAQ,CAAC,WAAW,EAAE,CAAC;IAC3B,CAAC;IAEa,gBAAW,GAAzB,UAA0B,CAAC;QACvB,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,+DAA+D;QAC/D,IAAI,CAAC,GAAG,CAAC,CAAC,8MAA8M,GAAG,CAAC,GAAG,iCAAiC,CAAC,CAAC;QAClQ,CAAC,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IAEa,eAAU,GAAxB;QACI,2EAA2E;QAC3E,IAAI,IAAI,GAAG,EAAE,EAAE,IAAI,CAAC;QACpB,IAAI,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1F,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IAChB,CAAC;IACL,WAAC;AAAD,CAAC,AAvCD,IAuCC;AAAA,CAAC"}

17
DynamicBibleUtility/DynamicBibleApp/js/Words.js
View File

@ -1,18 +1,13 @@
var IndexResult = (function () {
function IndexResult() {
}
return IndexResult;
}());
var Words = (function () { var Words = (function () {
function Words() { function Words() {
} }
Words.ConvertResultsToArray = function (r) { Words.ConvertResultsToArray = function (r) {
try { try {
var results = new Array(); var results_1 = new Array();
$(r).each(function () { $(r).each(function () {
results.push([$(this).attr("b"), $(this).attr("ch"), $(this).attr("v")]); results_1.push([$(this).attr("b"), $(this).attr("ch"), $(this).attr("v")]);
}); });
return results; return results_1;
} }
catch (err) { catch (err) {
Util.HandleError(err); Util.HandleError(err);
@ -391,12 +386,12 @@ var Words = (function () {
// get the first result // get the first result
var result = results[0]; var result = results[0];
// for each additional result, get the shared set // for each additional result, get the shared set
for (i = 1; i < results.length; i++) { for (var i = 1; i < results.length; i++) {
result = this.ReturnSharedSet(results[i], result); result = this.ReturnSharedSet(results[i], result);
} }
// convert the references back into book, chapter and verse. // convert the references back into book, chapter and verse.
for (i = 0; i < result.length; i++) { for (var i = 0; i < result.length; i++) {
ref = result[i]; var ref = result[i];
result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000); result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000);
} }
return result; return result;

2
DynamicBibleUtility/DynamicBibleApp/js/Words.js.map
View File

File diff suppressed because one or more lines are too long

2
DynamicBibleUtility/DynamicBibleApp/js/test.js.map
View File

@ -1 +1 @@
{"version":3,"file":"test.js","sourceRoot":"","sources":["../ts/test.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,qCAAqC;AAEnC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAE5B,IAAI,CAAC,+BAA+B,EAAE;IAChC,IAAI,KAAK,GAAG;QACR,CAAC,eAAe,EAAE,iBAAiB,CAAC;QACpC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;QACzC,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,yBAAyB,EAAE,kBAAkB,CAAC;QAC/C,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;QAC3C,CAAC,UAAU,EAAE,kBAAkB,CAAC;QAChC,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QAC5B,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;QACtC,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;QAC1C,CAAC,cAAc,EAAE,kBAAkB,CAAC;QACpC,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,8BAA8B,EAAE,kBAAkB,CAAC;QACpD,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;QAC9C,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,eAAe,EAAE,kBAAkB,CAAC;QACrC,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QAC5B,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;QAC9C,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,eAAe,EAAE,kBAAkB,CAAC;KACxC,CAAC;IACF,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,GAAG,GAAI,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC5B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;AACL,CAAC,CAAC,CAAC"} {"version":3,"file":"test.js","sourceRoot":"","sources":["../ts/test.ts"],"names":[],"mappings":"AAAA,wCAAwC;AACxC,qCAAqC;AAErC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;AAE1B,IAAI,CAAC,+BAA+B,EAAE;IAClC,IAAI,KAAK,GAAG;QACR,CAAC,eAAe,EAAE,iBAAiB,CAAC;QACpC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;QACzC,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,yBAAyB,EAAE,kBAAkB,CAAC;QAC/C,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;QAC3C,CAAC,UAAU,EAAE,kBAAkB,CAAC;QAChC,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QAC5B,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,gBAAgB,EAAE,kBAAkB,CAAC;QACtC,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,cAAc,EAAE,gBAAgB,CAAC;QAClC,CAAC,oBAAoB,EAAE,kBAAkB,CAAC;QAC1C,CAAC,cAAc,EAAE,kBAAkB,CAAC;QACpC,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;QACpC,CAAC,8BAA8B,EAAE,kBAAkB,CAAC;QACpD,CAAC,uBAAuB,EAAE,kBAAkB,CAAC;QAC7C,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;QAC9C,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,eAAe,EAAE,kBAAkB,CAAC;QACrC,CAAC,QAAQ,EAAE,gBAAgB,CAAC;QAC5B,CAAC,mBAAmB,EAAE,gBAAgB,CAAC;QACvC,CAAC,0BAA0B,EAAE,gBAAgB,CAAC;QAC9C,CAAC,UAAU,EAAE,gBAAgB,CAAC;QAC9B,CAAC,YAAY,EAAE,gBAAgB,CAAC;QAChC,CAAC,YAAY,EAAE,kBAAkB,CAAC;QAClC,CAAC,eAAe,EAAE,kBAAkB,CAAC;KACxC,CAAC;IACF,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,GAAG,GAAG,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC5B,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;AACL,CAAC,CAAC,CAAC"}

2
DynamicBibleUtility/DynamicBibleApp/ts/Bible.ts
View File

@ -20,7 +20,7 @@ type BiblePassageResult = {
class Bible { class Bible {
public static DisplayPassage(result: BiblePassageResult, ref: Reference): void { public static DisplayPassage(result: BiblePassageResult, ref: Reference): void {
try { try {
var r = ""; let r = "";
for (let j = 0; j < result.cs.length; j++) { for (let j = 0; j < result.cs.length; j++) {
if (Number(ref.Section.start.chapter) < Number(ref.Section.end.chapter)) { if (Number(ref.Section.start.chapter) < Number(ref.Section.end.chapter)) {
r += "<b>Chapter: " + result.cs[j].ch + "</b><br />"; r += "<b>Chapter: " + result.cs[j].ch + "</b><br />";

12
DynamicBibleUtility/DynamicBibleApp/ts/Reference.ts
View File

@ -99,7 +99,7 @@ class Reference {
let thing = this.Section.start; let thing = this.Section.start;
if (isEnd) thing = this.Section.end; if (isEnd) thing = this.Section.end;
var fbook = this.ref.substring(0, this.ref.search(/\w\s+\d/i) + 1); let fbook = this.ref.substring(0, this.ref.search(/\w\s+\d/i) + 1);
if (!fbook) if (!fbook)
fbook = this.ref; fbook = this.ref;
this.ref = this.ref.slice(this.ref.search(/\w\s+\d/i) + 1); this.ref = this.ref.slice(this.ref.search(/\w\s+\d/i) + 1);
@ -507,9 +507,9 @@ class Reference {
if (isEnd) thing = this.Section.end; if (isEnd) thing = this.Section.end;
this.ref = StringUtils.ltrim(this.ref); this.ref = StringUtils.ltrim(this.ref);
var found = false; let found = false;
for (var i = 0; i <= this.ref.length; i++) { for (let i = 0; i <= this.ref.length; i++) {
var c = this.ref.charAt(i); let c = this.ref.charAt(i);
// Grab characters until we hit a non digit. // Grab characters until we hit a non digit.
if ("0".charAt(0) <= c && c <= "9".charAt(0)) { if ("0".charAt(0) <= c && c <= "9".charAt(0)) {
found = true; found = true;
@ -546,7 +546,7 @@ class Reference {
return; return;
} }
for (var i = 0; i <= this.ref.length; i++) { for (var i = 0; i <= this.ref.length; i++) {
var c = this.ref.charAt(i); let c = this.ref.charAt(i);
if ("0".charAt(0) <= c && c <= "9".charAt(0)) { if ("0".charAt(0) <= c && c <= "9".charAt(0)) {
thing.verse = thing.verse.concat(c); thing.verse = thing.verse.concat(c);
} else { } else {
@ -602,7 +602,7 @@ class Reference {
}; };
private maybeDo(f) { private maybeDo(f) {
var func = f; let func = f;
this.ref = StringUtils.ltrim(this.ref.toLowerCase()); this.ref = StringUtils.ltrim(this.ref.toLowerCase());
if (this.ref != "") { if (this.ref != "") {
func(); func();

8
DynamicBibleUtility/DynamicBibleApp/ts/Settings.ts
View File

@ -62,13 +62,13 @@ class Settings {
} }
public static IncreaseResultFontSize() { public static IncreaseResultFontSize() {
var s = $("#result").css("font-size"); let s = $("#result").css("font-size");
$("#result").css("font-size", parseInt(s) + 1); $("#result").css("font-size", parseInt(s) + 1);
this.Save(); this.Save();
} }
public static DecreaseResultFontSize() { public static DecreaseResultFontSize() {
var s = $("#result").css("font-size"); let s = $("#result").css("font-size");
$("#result").css("font-size", parseInt(s) - 1); $("#result").css("font-size", parseInt(s) - 1);
this.Save(); this.Save();
} }
@ -84,8 +84,8 @@ class Settings {
public static SaveResults() { public static SaveResults() {
if (typeof localStorage != 'undefined') { if (typeof localStorage != 'undefined') {
var results = ""; let results = "";
for (var ref in CurrentReferences) { for (let ref in CurrentReferences) {
results += ref + ';'; results += ref + ';';
} }
localStorage.setItem(SettingsProp.Results, results); localStorage.setItem(SettingsProp.Results, results);

2
DynamicBibleUtility/DynamicBibleApp/ts/Strongs.ts
View File

@ -38,7 +38,7 @@ class Strongs {
crossrefs: [], crossrefs: [],
rmaccode: '', rmaccode: '',
}; };
var url = dict + Math.ceil(sn / 100) + ".json"; let url = dict + Math.ceil(sn / 100) + ".json";
if (dict == "grk") { if (dict == "grk") {
results.prefix = "G"; results.prefix = "G";
if (sn > 5624) return; if (sn > 5624) return;

15
DynamicBibleUtility/DynamicBibleApp/ts/Util.ts
View File

@ -1,22 +1,22 @@
class Util { class Util {
public static HandleLink(e: Event) { public static HandleLink(e: Event):void {
Search($(e.target).text()); Search($(e.target).text());
Settings.SaveResults(); Settings.SaveResults();
} }
public static HandleHiddenLink(e: Event) { public static HandleHiddenLink(e: Event):void {
Search($(e.target).find(".searchvalue").text()); Search($(e.target).find(".searchvalue").text());
Settings.SaveResults(); Settings.SaveResults();
} }
public static RemoveResult(e: Event) { public static RemoveResult(e: Event):void {
let ref = $(e.target).parent().parent().children(".resultbody").children("h2").children("a").text(); let ref = $(e.target).parent().parent().children(".resultbody").children("h2").children("a").text();
delete CurrentReferences[ref.trim().toLowerCase()]; delete CurrentReferences[ref.trim().toLowerCase()];
$(e.target).parent().parent().remove(); $(e.target).parent().parent().remove();
Settings.SaveResults(); Settings.SaveResults();
} }
public static HandleError(e) { public static HandleError(e):void {
let self = this; let self = this;
// for now we're going to put the error in the main result div. // for now we're going to put the error in the main result div.
let t = $("<div class='strongsdef result'><a href='javascript:void(0)' class='removeresult' style='border: 0;'><img style='border: 0px;' src='images/delete.png' width='48' height='48' /></a><span class='resultbody'>" + e + "</span><br clear='all' /></div>"); let t = $("<div class='strongsdef result'><a href='javascript:void(0)' class='removeresult' style='border: 0;'><img style='border: 0px;' src='images/delete.png' width='48' height='48' /></a><span class='resultbody'>" + e + "</span><br clear='all' /></div>");
@ -24,14 +24,13 @@
t.find(".removeresult").click(function (e) { t.find(".removeresult").click(function (e) {
self.RemoveResult(e); self.RemoveResult(e);
}); });
return false;
} }
public static GetUrlVars() { public static GetUrlVars() {
// Read a page's GET URL variables and return them as an associative array. // Read a page's GET URL variables and return them as an associative array.
var vars = [], hash; let vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); let hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
for (var i = 0; i < hashes.length; i++) { for (let i = 0; i < hashes.length; i++) {
hash = hashes[i].split('='); hash = hashes[i].split('=');
vars.push(hash[0]); vars.push(hash[0]);
vars[hash[0]] = hash[1]; vars[hash[0]] = hash[1];

55
DynamicBibleUtility/DynamicBibleApp/ts/Words.ts
View File

@ -1,4 +1,4 @@
class IndexResult { type IndexResult = {
refs: string[]; refs: string[];
word: string; word: string;
} }
@ -6,7 +6,7 @@
class Words { class Words {
public static ConvertResultsToArray(r) { public static ConvertResultsToArray(r) {
try { try {
var results = new Array(); let results = new Array();
$(r).each(function () { $(r).each(function () {
results.push([$(this).attr("b"), $(this).attr("ch"), $(this).attr("v")]); results.push([$(this).attr("b"), $(this).attr("ch"), $(this).attr("v")]);
}); });
@ -16,11 +16,12 @@ class Words {
} }
return null; return null;
} }
public static DisplayResults(results, q) { public static DisplayResults(results, q) {
try { try {
var txt = "<h4>Query: <a href='javascript:void(0)' class='link'>" + q + "</a></h4><ul>"; let txt = "<h4>Query: <a href='javascript:void(0)' class='link'>" + q + "</a></h4><ul>";
for (var i = 0; i < results.length; i++) { for (let i = 0; i < results.length; i++) {
var r = results[i].split(":"); let r = results[i].split(":");
txt += "<li /><a href='javascript:void(0)' class='link' alt='" + Reference.bookName(r[0]) + " " + r[1] + ":" + r[2] + "'>" + Reference.bookName(r[0]) + " " + r[1] + ":" + r[2] + "</a>"; txt += "<li /><a href='javascript:void(0)' class='link' alt='" + Reference.bookName(r[0]) + " " + r[1] + ":" + r[2] + "'>" + Reference.bookName(r[0]) + " " + r[1] + ":" + r[2] + "</a>";
} }
txt += "</ul>"; txt += "</ul>";
@ -36,20 +37,21 @@ class Words {
} }
return null; return null;
} }
public static FindReferences(qry) { public static FindReferences(qry) {
try { try {
qry = qry.toLowerCase(); qry = qry.toLowerCase();
var qs = qry.split(" "); let qs = qry.split(" ");
var words = this.BuildIndexArray().sort(); let words = this.BuildIndexArray().sort();
var results = new Array(); let results = new Array();
// Loop through each query term. // Loop through each query term.
for (let i = 0; i < qs.length; i++) { for (let i = 0; i < qs.length; i++) {
var q = qs[i].replace("'", ""); // we don't included ticks in our words. let q = qs[i].replace("'", ""); // we don't included ticks in our words.
// For each query term, figure out which xml file it is in, and get it. // For each query term, figure out which xml file it is in, and get it.
// getSearchRefs returns an array of references. // getSearchRefs returns an array of references.
for (var w = 0; w < words.length; w++) { for (let w = 0; w < words.length; w++) {
// If we are at the end of the array, we want to use a different test. // If we are at the end of the array, we want to use a different test.
if (w == 0) { if (w == 0) {
if (q <= words[w]) { if (q <= words[w]) {
@ -70,7 +72,7 @@ class Words {
if (results.length == 1) { if (results.length == 1) {
this.DisplayResults(results[0], qry); this.DisplayResults(results[0], qry);
} else { } else {
var shared = this.FindSharedSet(results); let shared = this.FindSharedSet(results);
if (shared == null) { if (shared == null) {
shared = []; shared = [];
} }
@ -84,6 +86,7 @@ class Words {
} }
return null; return null;
} }
public static GetSearchReferences(url, query) { public static GetSearchReferences(url, query) {
try { try {
// getSearchRefs takes a url and uses ajax to retrieve the references and returns an array of references. // getSearchRefs takes a url and uses ajax to retrieve the references and returns an array of references.
@ -103,7 +106,7 @@ class Words {
}); });
// find the right word // find the right word
var refs = $.grep(r, function (o, i) { let refs = $.grep(r, function (o, i) {
return o.word == query; return o.word == query;
}); });
if (refs.length > 0) { if (refs.length > 0) {
@ -116,8 +119,9 @@ class Words {
} }
return []; return [];
} }
public static BuildIndexArray() { public static BuildIndexArray() {
var words = new Array(); let words = new Array();
words.unshift('abiram'); words.unshift('abiram');
words.unshift('accepteth'); words.unshift('accepteth');
words.unshift('acquit'); words.unshift('acquit');
@ -367,19 +371,20 @@ class Words {
words.unshift('zuzims'); words.unshift('zuzims');
return words; return words;
} }
public static FindSharedSet(results) { public static FindSharedSet(results) {
try { try {
// FindSharedSet takes an array of reference arrays, and figures out which references are shared // FindSharedSet takes an array of reference arrays, and figures out which references are shared
// by all arrays/sets, then returns a single array of references. // by all arrays/sets, then returns a single array of references.
for (var j in results) { for (let j in results) {
var refs = results[j]; let refs = results[j];
if (refs != null) { if (refs != null) {
for (var i = 0; i < refs.length; i++) { for (let i = 0; i < refs.length; i++) {
var r = refs[i].split(":"); let r = refs[i].split(":");
// convert references to single integers. // convert references to single integers.
// Book * 100000, Chapter * 1000, Verse remains same, add all together. // Book * 100000, Chapter * 1000, Verse remains same, add all together.
var ref = parseInt(r[0]) * 100000000; let ref = parseInt(r[0]) * 100000000;
ref = ref + (parseInt(r[1]) * 10000); ref = ref + (parseInt(r[1]) * 10000);
ref = ref + parseInt(r[2]); ref = ref + parseInt(r[2]);
results[j][i] = ref; results[j][i] = ref;
@ -390,16 +395,16 @@ class Words {
} }
// get the first result // get the first result
var result = results[0]; let result = results[0];
// for each additional result, get the shared set // for each additional result, get the shared set
for (i = 1; i < results.length; i++) { for (let i = 1; i < results.length; i++) {
result = this.ReturnSharedSet(results[i], result); result = this.ReturnSharedSet(results[i], result);
} }
// convert the references back into book, chapter and verse. // convert the references back into book, chapter and verse.
for (i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
ref = result[i]; let ref = result[i];
result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000); result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000);
} }
@ -409,6 +414,7 @@ class Words {
} }
return null; return null;
} }
public static ReturnSharedSet(x, y) { public static ReturnSharedSet(x, y) {
try { try {
/// <summary> /// <summary>
@ -416,9 +422,9 @@ class Words {
/// containing a set of values shared by arrays. /// containing a set of values shared by arrays.
/// </summary> /// </summary>
// declare iterator // declare iterator
var i = 0; let i = 0;
// declare terminator // declare terminator
var t = (x.length < y.length) ? x.length : y.length; let t = (x.length < y.length) ? x.length : y.length;
// sort the arrays // sort the arrays
x.sort(SortNumeric); x.sort(SortNumeric);
y.sort(SortNumeric); y.sort(SortNumeric);
@ -453,6 +459,7 @@ class Words {
} }
return null; return null;
} }
public static AttachEvents(t) { public static AttachEvents(t) {
t.find(".link").click(function (e) { t.find(".link").click(function (e) {
Util.HandleLink(e); Util.HandleLink(e);

10
DynamicBibleUtility/DynamicBibleApp/ts/test.ts
View File

@ -4,7 +4,7 @@
QUnit.module("reference"); QUnit.module("reference");
test("Tests Bible Reference Parsing", function () { test("Tests Bible Reference Parsing", function () {
var tests = [ let tests = [
["acts 1:4 - 60", "Acts 1:4 - 1:60"], ["acts 1:4 - 60", "Acts 1:4 - 1:60"],
["acts 1:4 - *", "Acts 1:4 - 1:*"], ["acts 1:4 - *", "Acts 1:4 - 1:*"],
["acts 1:4 - 2:8", "Acts 1:4 - 2:8"], ["acts 1:4 - 2:8", "Acts 1:4 - 2:8"],
@ -44,10 +44,10 @@ test("Tests Bible Reference Parsing", function () {
["1 John 4-6", "1 John 4:1 - 6:*"], ["1 John 4-6", "1 John 4:1 - 6:*"],
["1 John 4 - 5 ", "1 John 4:1 - 5:*"] ["1 John 4 - 5 ", "1 John 4:1 - 5:*"]
]; ];
for (var i = 0; i < tests.length; i++) { for (let i = 0; i < tests.length; i++) {
var t = tests[i]; let t = tests[i];
var ref = new Reference(t[0]); let ref = new Reference(t[0]);
var parsed = ref.toString(); let parsed = ref.toString();
equal(parsed, t[1], parsed + " == " + t[1]); equal(parsed, t[1], parsed + " == " + t[1]);
} }
}); });