diff options
author | zefanja <zefanja@freenet.de> | 2014-01-31 15:26:58 +0700 |
---|---|---|
committer | zefanja <zefanja@freenet.de> | 2014-01-31 15:26:58 +0700 |
commit | ad32f20588c68ffa05d24a6cc843634b28603b82 (patch) | |
tree | f83330b1a813ddbf68bd3942a496a49f4bcaead1 /source/main.js | |
parent | 546476aa09a0bf83be894cb4d57f1cf81487f115 (diff) | |
download | biblez-ng-ad32f20588c68ffa05d24a6cc843634b28603b82.tar.gz |
* fixed #6
* updated submodules
Diffstat (limited to 'source/main.js')
-rw-r--r-- | source/main.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/main.js b/source/main.js index a8636b8..d24e9d3 100644 --- a/source/main.js +++ b/source/main.js @@ -144,7 +144,7 @@ enyo.kind({ api.get("settings", enyo.bind(this, function(inError, inSettings) { if(!inError) { this.settings = (inSettings) ? inSettings: this.settings; - if(inEvent.setting === "linebreak" || inEvent.setting === "footnotes" || inEvent.setting === "headings" || inEvent.setting === "crossReferences") + if(inEvent.setting === "linebreak" || inEvent.setting === "footnotes" || inEvent.setting === "headings" || inEvent.setting === "crossReferences" || inEvent.setting === "introductions" || inEvent.setting === "woc") this.handlePassage(); } else { this.handleError("Couldn't load settings!"); @@ -261,7 +261,9 @@ enyo.kind({ oneVersePerLine: this.settings.linebreak ? true : false, footnotes: this.settings.footnotes ? true : false, crossReferences: this.settings.crossReferences ? true : false, + intro: this.settings.introductions ? true : false, headings: this.settings.hasOwnProperty("headings") ? this.settings.headings : true, + wordsOfChristInRed: this.settings.woc ? true : false, }, enyo.bind(this, function (inError, inResult) { this.$.spinner.stop(); @@ -492,8 +494,10 @@ enyo.kind({ this.currentModule.renderText(attributes.osisRef, {oneVersePerLine: false, footnotes: false, headings: false}, enyo.bind(this, function (inError, inResult) { if(!inError) { + this.$.footnotePopup.hide(); this.$.footnotePopup.setText(inResult.text); this.$.footnotePopup.handleSpinner(false); + this.$.footnotePopup.showAtEvent(inEvent); } else { this.$.footnotePopup.hide(); this.handleError(inError.message); |