Skip to content

Commit eeeed40

Browse files
scruffianscruffian
committed
pass through version data properly
1 parent 9acca8d commit eeeed40

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

‎api/reference.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ javascripture.api.reference = {
3535
result.next = next;
3636
}
3737

38+
result.leftVersion = reference.leftVersion;
39+
result.rightVersion = reference.rightVersion;
3840
if( javascripture.data.hebrew[book] ) {
3941
result.testament = 'hebrew';
4042
} else {

‎modules/reference.js‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ javascripture.modules.reference = {
142142
createReferenceLink: function( reference ) {
143143
return 'reference=' + reference.book + ':' + reference.chapter + ':' + reference.verse;
144144
},
145-
getChapterText: function ( reference, chapterData, testament ) {
145+
getChapterText: function ( result, reference, chapterData, testament ) {
146146
var self = this,
147147
book = reference.book,
148148
chapter = reference.chapter,
@@ -156,15 +156,15 @@ javascripture.modules.reference = {
156156

157157
if ( chapterData && chapterData.right ) {
158158
chapterData.right.forEach( function( verseText, verseNumber ) {
159-
chapterText += self.getVerseString( reference, chapterData, book, chapter, verseText, verseNumber, verseInArray, testament );
159+
chapterText += self.getVerseString( result, reference, chapterData, book, chapter, verseText, verseNumber, verseInArray, testament );
160160
});
161161
}
162162

163163
chapterText += '</ol>';
164164
chapterText += '</div>';
165165
return chapterText;
166166
},
167-
getVerseString: function( reference, chapterData, book, chapter, verseText, verseNumber, verseInArray, testament ) {
167+
getVerseString: function( result, reference, chapterData, book, chapter, verseText, verseNumber, verseInArray, testament ) {
168168
var self = this,
169169
chapterText = '';
170170
chapterText += '<li id="' + book.replace( / /gi, '_' ) + '_' + chapter + '_' + ( verseNumber + 1 ) + '"';
@@ -181,29 +181,29 @@ javascripture.modules.reference = {
181181
context = true;
182182
}
183183
chapterText += '>';
184-
chapterText += '<div class="right ' + reference.rightVersion + ' ' + testament + '">';
185-
if ( reference.rightVersion === 'lc' ) {
184+
chapterText += '<div class="right ' + result.rightVersion + ' ' + testament + '">';
185+
if ( result.rightVersion === 'lc' ) {
186186
//same as below
187187
chapterData.left[verseNumber].forEach( function( wordObject, wordNumber ) {
188188
if ( wordObject ) {
189-
chapterText += self.createWordString( wordObject, 'english', testament, reference.rightVersion );
189+
chapterText += self.createWordString( wordObject, 'english', testament, result.rightVersion );
190190
}
191191
});
192192
} else {
193193
chapterData.right[verseNumber].forEach( function( wordObject, wordNumber ) {
194194
if ( wordObject ) {
195-
chapterText += self.createWordString( wordObject, 'english', testament, reference.rightVersion );
195+
chapterText += self.createWordString( wordObject, 'english', testament, result.rightVersion );
196196
}
197197
});
198198
}
199199
chapterText += "</div>";
200200

201201
//Load left
202202
if( chapterData.left[verseNumber] ) {
203-
chapterText += "<div class='left " + reference.leftVersion + ' ' + testament + "'>";
203+
chapterText += "<div class='left " + result.leftVersion + ' ' + testament + "'>";
204204
chapterData.left[verseNumber].forEach( function( wordObject, wordNumber ) {
205205
if ( wordObject ) {
206-
chapterText += self.createWordString( wordObject, testament, testament, reference.leftVersion );
206+
chapterText += self.createWordString( wordObject, testament, testament, result.leftVersion );
207207
}
208208
});
209209
chapterText += "</div>";
@@ -219,8 +219,9 @@ javascripture.modules.reference = {
219219
wordDisplay,// = wordArray[0].replace(/\//g, ''),
220220
lemma,
221221
lemmaString = '';
222-
if ( typeof wordArray[ 1 ] === 'undefined' )
222+
if ( typeof wordArray[ 1 ] === 'undefined' ) {
223223
return '<span>' + wordArray[0] + '</span> ';
224+
}
224225

225226
//if ( language === 'hebrew' ) {
226227
wordDisplayArray = wordArray[0].split( /\//g );
@@ -232,6 +233,7 @@ javascripture.modules.reference = {
232233
}
233234
lemma.forEach( function( lemmaValue, key ) {
234235
var morphLanguage = '';
236+
console.log( version );
235237
if ( version === 'original' || version === 'lc' ) {
236238
if ( 'undefined' !== typeof wordDisplayArray[ key ] ) {
237239
wordDisplay = wordDisplayArray[ key ];
@@ -390,15 +392,15 @@ javascripture.modules.reference = {
390392

391393
// This is a bit messy
392394
if ( e.data.result.prev ) {
393-
chapterText += javascripture.modules.reference.getChapterText( e.data.result.prev, e.data.result.chapters[0], e.data.result.testament );
394-
chapterText += javascripture.modules.reference.getChapterText( reference, e.data.result.chapters[1], e.data.result.testament );
395+
chapterText += javascripture.modules.reference.getChapterText( e.data.result, e.data.result.prev, e.data.result.chapters[0], e.data.result.testament );
396+
chapterText += javascripture.modules.reference.getChapterText( e.data.result, reference, e.data.result.chapters[1], e.data.result.testament );
395397
if ( e.data.result.next ) {
396-
chapterText += javascripture.modules.reference.getChapterText( e.data.result.next, e.data.result.chapters[2], e.data.result.testament );
398+
chapterText += javascripture.modules.reference.getChapterText( e.data.result, e.data.result.next, e.data.result.chapters[2], e.data.result.testament );
397399
}
398400
} else {
399-
chapterText += javascripture.modules.reference.getChapterText( reference, e.data.result.chapters[0], e.data.result.testament );
401+
chapterText += javascripture.modules.reference.getChapterText( e.data.result, reference, e.data.result.chapters[0], e.data.result.testament );
400402
if ( e.data.result.next ) {
401-
chapterText += javascripture.modules.reference.getChapterText( e.data.result.next, e.data.result.chapters[1], e.data.result.testament );
403+
chapterText += javascripture.modules.reference.getChapterText( e.data.result, e.data.result.next, e.data.result.chapters[1], e.data.result.testament );
402404
}
403405
}
404406

0 commit comments

Comments
 (0)