diff --git a/js/bible_ref_parsing.js b/js/bible_ref_parsing.js index fcbfdce3..fc554593 100644 --- a/js/bible_ref_parsing.js +++ b/js/bible_ref_parsing.js @@ -528,6 +528,7 @@ function maybeParseRangeSep(ref, r, errAcc) { return ""; }); } + function Reference(ref) { r = { @@ -645,3 +646,14 @@ function bookName(booknum) { return book[booknum]; } + +Reference.prototype.toString = function() { + var ref = this.bookname.concat(" "). + concat(this.startchapter).concat(":"). + concat(this.startverse); + if (this.startchapter == this.endchapter) { + return ref.concat("-").concat(this.endverse); + } + return ref.concat("-").concat(this.endchapter) + .concat(":").concat(this.endverse); +}; diff --git a/js/common.js b/js/common.js index 05951d60..62fc7622 100644 --- a/js/common.js +++ b/js/common.js @@ -98,7 +98,7 @@ function Search(sv) { var myref = new Reference(q.trim()); var r = Bible.GetPassage(myref.book, myref.startchapter, myref.endchapter, myref.startverse, myref.endverse); - Bible.DisplayPassage(r.cs, myref.book, myref.startchapter, myref.endchapter, myref.startverse, myref.endverse, r.testament); + Bible.DisplayPassage(r.cs, myref, r.testament); } } } @@ -218,18 +218,15 @@ var Util = { }; var Bible = { - DisplayPassage: function(cs, b, sch, ech, sv, ev, testament) { + DisplayPassage: function(cs, ref, testament) { + console.log(ref.toSource()); try { var r = ""; // make the end verse pretty. var tvs = cs[cs.length - 1].vss.length; - if (ev == "*" || ev > tvs) { - ev = tvs; - } - for (var j = 0; j < cs.length; j++) { - if (sch < ech) { + if (Number(ref.startchapter) < Number(ref.endchapter)) { r += "Chapter: " + cs[j].ch + "
"; } var vss = cs[j].vss; @@ -254,7 +251,7 @@ var Bible = { r += "
"; } } - var t = $("
" + "

" + bookName(b) + " " + sch + ":" + sv + "-" + ech + ":" + ev + "

" + r + "

"); + var t = $("
" + "

" + ref.toString() + "

" + r + "

"); t.find(".hiddenlink").click(function(e) { Util.HandleHiddenLink(e);