* fixed #6

* updated submodules

3 files changed, 20 insertions, 2 deletions

diff --git a/source/App.css b/source/App.css
index b4216ea..7b1cdbc 100644
--- a/source/App.css
+++ b/source/App.css
@@ -87,7 +87,10 @@
 
 .sword-footnote {
     text-decoration: none;
+}
 
+.sword-intro {
+    font-style: italic;
 }
 
 /* MODULE MANAGER */
@@ -228,7 +231,6 @@ h3, h1 {
 }
 
 .note-popup {
-    min-width: 200px;
     max-width: 500px;
     max-height: 300px;
 }
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);
diff --git a/source/settings.js b/source/settings.js
index a3f457c..c15e0c7 100644
--- a/source/settings.js
+++ b/source/settings.js
@@ -31,6 +31,14 @@ enyo.kind({
                     {kind: "enyo.FittableColumns", classes: "settings-row", components: [
                         {content: $L("Enable Cross-References"), classes: "settings-item", fit: true},
                         {name: "tbCrossRef", key: "crossReferences", kind: "onyx.ToggleButton", onChange: "handleSettings"}
+                    ]},
+                    {kind: "enyo.FittableColumns", classes: "settings-row", components: [
+                        {content: $L("Enable Words of Christ in Red"), classes: "settings-item", fit: true},
+                        {name: "tbWoc", key: "woc", kind: "onyx.ToggleButton", onChange: "handleSettings"}
+                    ]},
+                    {kind: "enyo.FittableColumns", classes: "settings-row", components: [
+                        {content: $L("Enable Introductions"), classes: "settings-item", fit: true},
+                        {name: "tbIntro", key: "introductions", kind: "onyx.ToggleButton", onChange: "handleSettings"}
                     ]}
 
                 ]},
@@ -63,6 +71,10 @@ enyo.kind({
                     this.$.tbFootnote.updateVisualState();
                     this.$.tbCrossRef.value = inSettings.hasOwnProperty("crossReferences") ? inSettings.crossReferences : false;
                     this.$.tbCrossRef.updateVisualState();
+                    this.$.tbIntro.value = inSettings.hasOwnProperty("introductions") ? inSettings.introductions : false;
+                    this.$.tbIntro.updateVisualState();
+                    this.$.tbWoc.value = inSettings.hasOwnProperty("woc") ? inSettings.woc : false;
+                    this.$.tbWoc.updateVisualState();
                 }
             }
         }));