mirror of
https://gitlab.com/walljm/dynamicbible.git
synced 2025-07-25 16:29:49 -04:00
CLEANUP: More vars to lets, type checking
This commit is contained in:
jason.wall
parent
1f2383d2f8
commit
05e3801666
@ -23,7 +23,6 @@ var Util = (function () {
|
||||
t.find(".removeresult").click(function (e) {
|
||||
self.RemoveResult(e);
|
||||
});
|
||||
return false;
|
||||
};
|
||||
Util.GetUrlVars = function () {
|
||||
// Read a page's GET URL variables and return them as an associative array.
|
||||
|
||||
@ -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"}
|
||||
@ -1,18 +1,13 @@
|
||||
var IndexResult = (function () {
|
||||
function IndexResult() {
|
||||
}
|
||||
return IndexResult;
|
||||
}());
|
||||
var Words = (function () {
|
||||
function Words() {
|
||||
}
|
||||
Words.ConvertResultsToArray = function (r) {
|
||||
try {
|
||||
var results = new Array();
|
||||
var results_1 = new Array();
|
||||
$(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) {
|
||||
Util.HandleError(err);
|
||||
@ -391,12 +386,12 @@ var Words = (function () {
|
||||
// get the first result
|
||||
var result = results[0];
|
||||
// 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);
|
||||
}
|
||||
// convert the references back into book, chapter and verse.
|
||||
for (i = 0; i < result.length; i++) {
|
||||
ref = result[i];
|
||||
for (var i = 0; i < result.length; i++) {
|
||||
var ref = result[i];
|
||||
result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000);
|
||||
}
|
||||
return result;
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -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"}
|
||||
@ -20,7 +20,7 @@ type BiblePassageResult = {
|
||||
class Bible {
|
||||
public static DisplayPassage(result: BiblePassageResult, ref: Reference): void {
|
||||
try {
|
||||
var r = "";
|
||||
let r = "";
|
||||
for (let j = 0; j < result.cs.length; j++) {
|
||||
if (Number(ref.Section.start.chapter) < Number(ref.Section.end.chapter)) {
|
||||
r += "<b>Chapter: " + result.cs[j].ch + "</b><br />";
|
||||
|
||||
@ -99,7 +99,7 @@ class Reference {
|
||||
let thing = this.Section.start;
|
||||
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)
|
||||
fbook = this.ref;
|
||||
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;
|
||||
|
||||
this.ref = StringUtils.ltrim(this.ref);
|
||||
var found = false;
|
||||
for (var i = 0; i <= this.ref.length; i++) {
|
||||
var c = this.ref.charAt(i);
|
||||
let found = false;
|
||||
for (let i = 0; i <= this.ref.length; i++) {
|
||||
let c = this.ref.charAt(i);
|
||||
// Grab characters until we hit a non digit.
|
||||
if ("0".charAt(0) <= c && c <= "9".charAt(0)) {
|
||||
found = true;
|
||||
@ -546,7 +546,7 @@ class Reference {
|
||||
return;
|
||||
}
|
||||
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)) {
|
||||
thing.verse = thing.verse.concat(c);
|
||||
} else {
|
||||
@ -602,7 +602,7 @@ class Reference {
|
||||
};
|
||||
|
||||
private maybeDo(f) {
|
||||
var func = f;
|
||||
let func = f;
|
||||
this.ref = StringUtils.ltrim(this.ref.toLowerCase());
|
||||
if (this.ref != "") {
|
||||
func();
|
||||
|
||||
@ -62,13 +62,13 @@ class Settings {
|
||||
}
|
||||
|
||||
public static IncreaseResultFontSize() {
|
||||
var s = $("#result").css("font-size");
|
||||
let s = $("#result").css("font-size");
|
||||
$("#result").css("font-size", parseInt(s) + 1);
|
||||
this.Save();
|
||||
}
|
||||
|
||||
public static DecreaseResultFontSize() {
|
||||
var s = $("#result").css("font-size");
|
||||
let s = $("#result").css("font-size");
|
||||
$("#result").css("font-size", parseInt(s) - 1);
|
||||
this.Save();
|
||||
}
|
||||
@ -84,8 +84,8 @@ class Settings {
|
||||
|
||||
public static SaveResults() {
|
||||
if (typeof localStorage != 'undefined') {
|
||||
var results = "";
|
||||
for (var ref in CurrentReferences) {
|
||||
let results = "";
|
||||
for (let ref in CurrentReferences) {
|
||||
results += ref + ';';
|
||||
}
|
||||
localStorage.setItem(SettingsProp.Results, results);
|
||||
|
||||
@ -38,7 +38,7 @@ class Strongs {
|
||||
crossrefs: [],
|
||||
rmaccode: '',
|
||||
};
|
||||
var url = dict + Math.ceil(sn / 100) + ".json";
|
||||
let url = dict + Math.ceil(sn / 100) + ".json";
|
||||
if (dict == "grk") {
|
||||
results.prefix = "G";
|
||||
if (sn > 5624) return;
|
||||
|
||||
@ -1,22 +1,22 @@
|
||||
class Util {
|
||||
public static HandleLink(e: Event) {
|
||||
public static HandleLink(e: Event):void {
|
||||
Search($(e.target).text());
|
||||
Settings.SaveResults();
|
||||
}
|
||||
|
||||
public static HandleHiddenLink(e: Event) {
|
||||
public static HandleHiddenLink(e: Event):void {
|
||||
Search($(e.target).find(".searchvalue").text());
|
||||
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();
|
||||
delete CurrentReferences[ref.trim().toLowerCase()];
|
||||
$(e.target).parent().parent().remove();
|
||||
Settings.SaveResults();
|
||||
}
|
||||
|
||||
public static HandleError(e) {
|
||||
public static HandleError(e):void {
|
||||
let self = this;
|
||||
// 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>");
|
||||
@ -24,14 +24,13 @@
|
||||
t.find(".removeresult").click(function (e) {
|
||||
self.RemoveResult(e);
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
public static GetUrlVars() {
|
||||
// Read a page's GET URL variables and return them as an associative array.
|
||||
var vars = [], hash;
|
||||
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
|
||||
for (var i = 0; i < hashes.length; i++) {
|
||||
let vars = [], hash;
|
||||
let hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
|
||||
for (let i = 0; i < hashes.length; i++) {
|
||||
hash = hashes[i].split('=');
|
||||
vars.push(hash[0]);
|
||||
vars[hash[0]] = hash[1];
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
class IndexResult {
|
||||
type IndexResult = {
|
||||
refs: string[];
|
||||
word: string;
|
||||
}
|
||||
@ -6,7 +6,7 @@
|
||||
class Words {
|
||||
public static ConvertResultsToArray(r) {
|
||||
try {
|
||||
var results = new Array();
|
||||
let results = new Array();
|
||||
$(r).each(function () {
|
||||
results.push([$(this).attr("b"), $(this).attr("ch"), $(this).attr("v")]);
|
||||
});
|
||||
@ -16,11 +16,12 @@ class Words {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static DisplayResults(results, q) {
|
||||
try {
|
||||
var txt = "<h4>Query: <a href='javascript:void(0)' class='link'>" + q + "</a></h4><ul>";
|
||||
for (var i = 0; i < results.length; i++) {
|
||||
var r = results[i].split(":");
|
||||
let txt = "<h4>Query: <a href='javascript:void(0)' class='link'>" + q + "</a></h4><ul>";
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
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 += "</ul>";
|
||||
@ -36,20 +37,21 @@ class Words {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static FindReferences(qry) {
|
||||
try {
|
||||
qry = qry.toLowerCase();
|
||||
var qs = qry.split(" ");
|
||||
var words = this.BuildIndexArray().sort();
|
||||
var results = new Array();
|
||||
let qs = qry.split(" ");
|
||||
let words = this.BuildIndexArray().sort();
|
||||
let results = new Array();
|
||||
|
||||
// Loop through each query term.
|
||||
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.
|
||||
// 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 (w == 0) {
|
||||
if (q <= words[w]) {
|
||||
@ -70,7 +72,7 @@ class Words {
|
||||
if (results.length == 1) {
|
||||
this.DisplayResults(results[0], qry);
|
||||
} else {
|
||||
var shared = this.FindSharedSet(results);
|
||||
let shared = this.FindSharedSet(results);
|
||||
if (shared == null) {
|
||||
shared = [];
|
||||
}
|
||||
@ -84,6 +86,7 @@ class Words {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static GetSearchReferences(url, query) {
|
||||
try {
|
||||
// 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
|
||||
var refs = $.grep(r, function (o, i) {
|
||||
let refs = $.grep(r, function (o, i) {
|
||||
return o.word == query;
|
||||
});
|
||||
if (refs.length > 0) {
|
||||
@ -116,8 +119,9 @@ class Words {
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
public static BuildIndexArray() {
|
||||
var words = new Array();
|
||||
let words = new Array();
|
||||
words.unshift('abiram');
|
||||
words.unshift('accepteth');
|
||||
words.unshift('acquit');
|
||||
@ -367,19 +371,20 @@ class Words {
|
||||
words.unshift('zuzims');
|
||||
return words;
|
||||
}
|
||||
|
||||
public static FindSharedSet(results) {
|
||||
try {
|
||||
// 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.
|
||||
|
||||
for (var j in results) {
|
||||
var refs = results[j];
|
||||
for (let j in results) {
|
||||
let refs = results[j];
|
||||
if (refs != null) {
|
||||
for (var i = 0; i < refs.length; i++) {
|
||||
var r = refs[i].split(":");
|
||||
for (let i = 0; i < refs.length; i++) {
|
||||
let r = refs[i].split(":");
|
||||
// convert references to single integers.
|
||||
// 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[2]);
|
||||
results[j][i] = ref;
|
||||
@ -390,16 +395,16 @@ class Words {
|
||||
}
|
||||
|
||||
// get the first result
|
||||
var result = results[0];
|
||||
let result = results[0];
|
||||
|
||||
// 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);
|
||||
}
|
||||
|
||||
// convert the references back into book, chapter and verse.
|
||||
for (i = 0; i < result.length; i++) {
|
||||
ref = result[i];
|
||||
for (let i = 0; i < result.length; i++) {
|
||||
let ref = result[i];
|
||||
result[i] = (ref / 100000000) + ":" + ((ref % 100000000) / 10000) + ":" + ((ref % 100000000) % 10000);
|
||||
}
|
||||
|
||||
@ -409,6 +414,7 @@ class Words {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static ReturnSharedSet(x, y) {
|
||||
try {
|
||||
/// <summary>
|
||||
@ -416,9 +422,9 @@ class Words {
|
||||
/// containing a set of values shared by arrays.
|
||||
/// </summary>
|
||||
// declare iterator
|
||||
var i = 0;
|
||||
let i = 0;
|
||||
// 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
|
||||
x.sort(SortNumeric);
|
||||
y.sort(SortNumeric);
|
||||
@ -453,6 +459,7 @@ class Words {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static AttachEvents(t) {
|
||||
t.find(".link").click(function (e) {
|
||||
Util.HandleLink(e);
|
||||
|
||||
@ -1,53 +1,53 @@
|
||||
/// <reference path="d.ts/qunit.d.ts" />
|
||||
/// <reference path="Reference.ts" />
|
||||
|
||||
QUnit.module("reference");
|
||||
QUnit.module("reference");
|
||||
|
||||
test("Tests Bible Reference Parsing", function () {
|
||||
var tests = [
|
||||
["acts 1:4 - 60", "Acts 1:4 - 1:60"],
|
||||
["acts 1:4 - *", "Acts 1:4 - 1:*"],
|
||||
["acts 1:4 - 2:8", "Acts 1:4 - 2:8"],
|
||||
["acts 1:4 - 1:8", "Acts 1:4 - 1:8"],
|
||||
["acts 1:4 - 2", "Acts 1:4 - 1:4"],
|
||||
["acts 1:4 - 8", "Acts 1:4 - 1:8"],
|
||||
["acts 1:4-8", "Acts 1:4 - 1:8"],
|
||||
["john 1:4 - john 2", "John 1:4 - 2:*"],
|
||||
["john 1 : 4 - john 2", "John 1:4 - 2:*"],
|
||||
["I john 1:4 - I john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 1:4 - 1 john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 1 : 4 - 1 john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 3 - 1 john 5", "1 John 3:1 - 5:*"],
|
||||
["1 John 1", "1 John 1:1 - 1:*"],
|
||||
["John 1", "John 1:1 - 1:*"],
|
||||
["1 John 1:1", "1 John 1:1 - 1:1"],
|
||||
[" 1 John 1 : 1 ", "1 John 1:1 - 1:1"],
|
||||
["John 1:1", "John 1:1 - 1:1"],
|
||||
[" John 1 : 1 ", "John 1:1 - 1:1"],
|
||||
[" 1 John 1 : 1 - 2 ", "1 John 1:1 - 1:2"],
|
||||
["1 John 1:1-2", "1 John 1:1 - 1:2"],
|
||||
["John 1:1-2", "John 1:1 - 1:2"],
|
||||
["John 1 : 1 - 2", "John 1:1 - 1:2"], //23
|
||||
["1 John 1 : 1 - 1 John 2 : 3 ", "1 John 1:1 - 2:3"],
|
||||
["1 John 1:1-1 John 2:3", "1 John 1:1 - 2:3"],
|
||||
["John 1:1-John 2:3", "John 1:1 - 2:3"],
|
||||
["John 1 : 1 - John 2 : 3 ", "John 1:1 - 2:3"], //27
|
||||
["John 1-2", "John 1:1 - 2:*"],
|
||||
["John 1 - 2", "John 1:1 - 2:*"],
|
||||
["1 John 1-2", "1 John 1:1 - 2:*"],
|
||||
["1 John 1 - 2 ", "1 John 1:1 - 2:*"],
|
||||
["John 3", "John 3:1 - 3:*"],
|
||||
["John 2:1-John 3:3", "John 2:1 - 3:3"],
|
||||
["John 2 : 1 - John 3 : 3 ", "John 2:1 - 3:3"],
|
||||
["John 3-4", "John 3:1 - 4:*"],
|
||||
["John 4 - 7", "John 4:1 - 7:*"],
|
||||
["1 John 4-6", "1 John 4:1 - 6:*"],
|
||||
["1 John 4 - 5 ", "1 John 4:1 - 5:*"]
|
||||
];
|
||||
for (var i = 0; i < tests.length; i++) {
|
||||
var t = tests[i];
|
||||
var ref = new Reference(t[0]);
|
||||
var parsed = ref.toString();
|
||||
equal(parsed, t[1], parsed + " == " + t[1]);
|
||||
}
|
||||
});
|
||||
let tests = [
|
||||
["acts 1:4 - 60", "Acts 1:4 - 1:60"],
|
||||
["acts 1:4 - *", "Acts 1:4 - 1:*"],
|
||||
["acts 1:4 - 2:8", "Acts 1:4 - 2:8"],
|
||||
["acts 1:4 - 1:8", "Acts 1:4 - 1:8"],
|
||||
["acts 1:4 - 2", "Acts 1:4 - 1:4"],
|
||||
["acts 1:4 - 8", "Acts 1:4 - 1:8"],
|
||||
["acts 1:4-8", "Acts 1:4 - 1:8"],
|
||||
["john 1:4 - john 2", "John 1:4 - 2:*"],
|
||||
["john 1 : 4 - john 2", "John 1:4 - 2:*"],
|
||||
["I john 1:4 - I john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 1:4 - 1 john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 1 : 4 - 1 john 2", "1 John 1:4 - 2:*"],
|
||||
["1 john 3 - 1 john 5", "1 John 3:1 - 5:*"],
|
||||
["1 John 1", "1 John 1:1 - 1:*"],
|
||||
["John 1", "John 1:1 - 1:*"],
|
||||
["1 John 1:1", "1 John 1:1 - 1:1"],
|
||||
[" 1 John 1 : 1 ", "1 John 1:1 - 1:1"],
|
||||
["John 1:1", "John 1:1 - 1:1"],
|
||||
[" John 1 : 1 ", "John 1:1 - 1:1"],
|
||||
[" 1 John 1 : 1 - 2 ", "1 John 1:1 - 1:2"],
|
||||
["1 John 1:1-2", "1 John 1:1 - 1:2"],
|
||||
["John 1:1-2", "John 1:1 - 1:2"],
|
||||
["John 1 : 1 - 2", "John 1:1 - 1:2"], //23
|
||||
["1 John 1 : 1 - 1 John 2 : 3 ", "1 John 1:1 - 2:3"],
|
||||
["1 John 1:1-1 John 2:3", "1 John 1:1 - 2:3"],
|
||||
["John 1:1-John 2:3", "John 1:1 - 2:3"],
|
||||
["John 1 : 1 - John 2 : 3 ", "John 1:1 - 2:3"], //27
|
||||
["John 1-2", "John 1:1 - 2:*"],
|
||||
["John 1 - 2", "John 1:1 - 2:*"],
|
||||
["1 John 1-2", "1 John 1:1 - 2:*"],
|
||||
["1 John 1 - 2 ", "1 John 1:1 - 2:*"],
|
||||
["John 3", "John 3:1 - 3:*"],
|
||||
["John 2:1-John 3:3", "John 2:1 - 3:3"],
|
||||
["John 2 : 1 - John 3 : 3 ", "John 2:1 - 3:3"],
|
||||
["John 3-4", "John 3:1 - 4:*"],
|
||||
["John 4 - 7", "John 4:1 - 7:*"],
|
||||
["1 John 4-6", "1 John 4:1 - 6:*"],
|
||||
["1 John 4 - 5 ", "1 John 4:1 - 5:*"]
|
||||
];
|
||||
for (let i = 0; i < tests.length; i++) {
|
||||
let t = tests[i];
|
||||
let ref = new Reference(t[0]);
|
||||
let parsed = ref.toString();
|
||||
equal(parsed, t[1], parsed + " == " + t[1]);
|
||||
}
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user