diff --git a/DynamicBibleUtility/DynamicBibleApp/css/bible.css b/DynamicBibleUtility/DynamicBibleApp/css/bible.css
index 99d13ee3..aed2b7d4 100644
--- a/DynamicBibleUtility/DynamicBibleApp/css/bible.css
+++ b/DynamicBibleUtility/DynamicBibleApp/css/bible.css
@@ -71,7 +71,7 @@ a:hover {
#resultwrap {
float: left;
font: 18px georgia;
-
+ width: 100%;
}
#resultwrap h3 {
@@ -122,6 +122,7 @@ a:hover {
{
display: block;
padding-left: 55px;
+ max-width: 900px;
}
#main .block {
diff --git a/DynamicBibleUtility/DynamicBibleApp/js/Bible.js b/DynamicBibleUtility/DynamicBibleApp/js/Bible.js
index 388accac..20d35292 100644
--- a/DynamicBibleUtility/DynamicBibleApp/js/Bible.js
+++ b/DynamicBibleUtility/DynamicBibleApp/js/Bible.js
@@ -1,24 +1,24 @@
var Bible = (function () {
function Bible() {
}
- Bible.DisplayPassage = function (cs, ref, testament) {
+ Bible.DisplayPassage = function (result, ref) {
try {
var r = "";
- for (var j = 0; j < cs.length; j++) {
- if (Number(ref.startchapter) < Number(ref.endchapter)) {
- r += "Chapter: " + cs[j].ch + "
";
+ for (var j = 0; j < result.cs.length; j++) {
+ if (Number(ref.Section.start.chapter) < Number(ref.Section.end.chapter)) {
+ r += "Chapter: " + result.cs[j].ch + "
";
}
- var vss = cs[j].vss;
+ var vss = result.cs[j].vss;
for (var m = 0; m < vss.length; m++) {
var v = vss[m];
r += "" + v.v + ". ";
for (var w = 0; w < v.w.length; w++) {
if (v.w[w].s != undefined) {
var strongs_pre = "";
- if (testament == "old") {
+ if (result.testament == "old") {
strongs_pre = "H";
}
- if (testament == "new") {
+ if (result.testament == "new") {
strongs_pre = "G";
}
var sp = "";
@@ -44,61 +44,61 @@ var Bible = (function () {
Util.HandleError(err);
}
};
- Bible.GetPassage = function (b, sch, ech, sv, ev) {
+ Bible.GetPassage = function (section) {
try {
- var chapters = []; // the verses from the chapter.
+ var chapters_1 = []; // the verses from the chapter.
var r = {
cs: [],
testament: ""
};
- for (var i = sch; i <= ech; i++) {
- var url = "data/bibles/kjv_strongs/" + b + "-" + i + ".json";
+ for (var i = Number(section.start.chapter); i <= Number(section.end.chapter); i++) {
+ var url = "data/bibles/kjv_strongs/" + section.start.book + "-" + i + ".json";
$.ajax({
async: false,
type: "GET",
url: url,
dataType: "json",
success: function (d, t, x) {
- chapters.push(d);
+ chapters_1.push(d);
},
error: function (request, status, error) {
Util.HandleError(error);
}
});
}
- for (var j = 0; j < chapters.length; j++) {
+ for (var j = 0; j < chapters_1.length; j++) {
var vss = [];
- var start;
- var end;
+ var start_1 = void 0;
+ var end = void 0;
// figure out the start verse.
if (j == 0) {
- start = sv;
+ start_1 = section.start.verse;
}
else {
- start = 1;
+ start_1 = 1;
}
// figure out the end verse
- if ((j + 1) == chapters.length) {
- end = ev;
+ if ((j + 1) == chapters_1.length) {
+ end = section.end.verse;
}
else {
end = "*";
}
// get the verses requested.
- var tvs = chapters[j].vss.length;
+ var tvs = chapters_1[j].vss.length;
if (end == "*" || end > tvs) {
end = tvs;
}
- for (i = start; i <= end; i++) {
+ for (var i = start_1; i <= end; i++) {
// we're using c based indexes here, so the index is 1 less than the verse #.
- vss.push(chapters[j].vss[i - 1]);
+ vss.push(chapters_1[j].vss[i - 1]);
}
r.cs.push({
- "ch": chapters[j].ch,
+ "ch": chapters_1[j].ch,
"vss": vss
});
}
- if (b >= 40) {
+ if (section.start.book >= 40) {
r.testament = "new";
}
else {
diff --git a/DynamicBibleUtility/DynamicBibleApp/js/Bible.js.map b/DynamicBibleUtility/DynamicBibleApp/js/Bible.js.map
index c9ac5d8e..cbe95576 100644
--- a/DynamicBibleUtility/DynamicBibleApp/js/Bible.js.map
+++ b/DynamicBibleUtility/DynamicBibleApp/js/Bible.js.map
@@ -1 +1 @@
-{"version":3,"file":"Bible.js","sourceRoot":"","sources":["../ts/Bible.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"Bible.js","sourceRoot":"","sources":["../ts/Bible.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/DynamicBibleUtility/DynamicBibleApp/js/Globals.js b/DynamicBibleUtility/DynamicBibleApp/js/Globals.js
index c4ae54a9..5eac3396 100644
--- a/DynamicBibleUtility/DynamicBibleApp/js/Globals.js
+++ b/DynamicBibleUtility/DynamicBibleApp/js/Globals.js
@@ -5,49 +5,6 @@ var CurrentReferences = {};
function SortNumeric(x, y) {
return x - y;
}
-function Traverse(node, testament) {
- try {
- var treeText = "";
- if (node != null) {
- if (node.hasChildNodes()) {
- if (node.nodeName == "s") {
- // you need to test if this is the OT or NT and set the attribute accordingly.
- var t = "";
- if (testament == "old") {
- t = "H";
- }
- if (testament == "new") {
- t = "G";
- }
- treeText += "";
- }
- else {
- treeText += '<' + node.nodeName + '>';
- for (var i = 0; i < node.childNodes.length; i++) {
- treeText += Traverse(node.childNodes.item(i), testament);
- }
- treeText += '' + node.nodeName + '>';
- }
- }
- else {
- if (node.nodeValue != null) {
- if (node.nodeValue.search(/^(\,|\.|\:|\?|\;|\!)/) != -1) {
- treeText += node.nodeValue;
- }
- else {
- treeText += " " + node.nodeValue;
- }
- }
- }
- }
- return treeText;
- }
- catch (err) {
- Util.HandleError(err);
- }
- return null;
-}
-;
function Search(sv) {
try {
var qs = sv.split(";");
@@ -82,10 +39,6 @@ function Search(sv) {
results.push(Strongs.GetStrongs(Ss[s], dict));
}
for (var result in results) {
- // display results.
- //if ($("#display-strongs-as-dialog")[0].checked) {
- // Strongs.DisplayStrongsDialog(results[result]);
- //} else {
Strongs.DisplayStrongs(results[result]);
}
if (store)
@@ -95,8 +48,8 @@ function Search(sv) {
// its a verse reference.
if (q.trim() != "") {
var myref = new Reference(q.trim());
- var r = Bible.GetPassage(myref.Section.start.book, myref.Section.start.chapter, myref.Section.end.chapter, myref.Section.start.verse, myref.Section.end.verse);
- Bible.DisplayPassage(r.cs, myref, r.testament);
+ var r = Bible.GetPassage(myref.Section);
+ Bible.DisplayPassage(r, myref);
CurrentReferences[myref.toString().toLowerCase()] = true;
}
}
diff --git a/DynamicBibleUtility/DynamicBibleApp/js/Globals.js.map b/DynamicBibleUtility/DynamicBibleApp/js/Globals.js.map
index 25f7bc48..b5bd3fb6 100644
--- a/DynamicBibleUtility/DynamicBibleApp/js/Globals.js.map
+++ b/DynamicBibleUtility/DynamicBibleApp/js/Globals.js.map
@@ -1 +1 @@
-{"version":3,"file":"Globals.js","sourceRoot":"","sources":["../ts/Globals.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"Globals.js","sourceRoot":"","sources":["../ts/Globals.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/DynamicBibleUtility/DynamicBibleApp/js/Strongs.js b/DynamicBibleUtility/DynamicBibleApp/js/Strongs.js
index 8cd3d56d..e10e83cb 100644
--- a/DynamicBibleUtility/DynamicBibleApp/js/Strongs.js
+++ b/DynamicBibleUtility/DynamicBibleApp/js/Strongs.js
@@ -17,12 +17,12 @@ var Strongs = (function () {
if (dict == "grk") {
results_1.prefix = "G";
if (sn > 5624)
- return false;
+ return;
}
else {
results_1.prefix = "H";
if (sn > 8674)
- return false;
+ return;
}
results_1.sn = sn;
$.ajax({
@@ -136,9 +136,9 @@ var Strongs = (function () {
var ref = k.r.split(";");
crtxt += " " + Traverse(node.childNodes.item(0), testament) + "" + Reference.bookName(parseInt(ref[0])) + " " + ref[1] + ":" + ref[2] + ", ";
}
+ crtxt = crtxt.substr(0, crtxt.length - 2);
+ crtxt += "
";
}
- crtxt = crtxt.substr(0, crtxt.length - 2);
- crtxt += "
";
}
crtxt += "";
}
@@ -147,8 +147,12 @@ var Strongs = (function () {
rtxt += "