* fixed #6

* updated submodules

9 files changed, 22 insertions, 4 deletions

diff --git a/biblez.appcache b/biblez.appcache
index 1dcfd7e..b9047a6 100644
--- a/biblez.appcache
+++ b/biblez.appcache
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# v2 - 2014-01-10
+# v3 - 2014-01-31
 CACHE:
 icon.png
 index.html
diff --git a/enyo b/enyo
-Subproject 71c24bea67806591a6ff6f40bbce9d27b96ae0f
+Subproject f008b21b8605829c2a280ae5937f81f10e3ac1e
diff --git a/lib/layout b/lib/layout
-Subproject 10c70b926a9739348792b9ee8c40dfb3744ce38
+Subproject 9d11748d8dc3b68e6695c07ec76f0cc257d4472
diff --git a/lib/onyx b/lib/onyx
-Subproject 69ea7023093b8d56c0e68ae4410df123bade74d
+Subproject 7956813945b0ced47fada839dbef1903c72252e
diff --git a/lib/sword b/lib/sword
-Subproject 2726bdb6b6409f20ccb5ff1614345cec444e5a3
+Subproject 9b436c16aed5e9c0fc5a1a467230e35349a4fca
diff --git a/manifest.desktop b/manifest.desktop
index 766aa86..da8d1df 100644
--- a/manifest.desktop
+++ b/manifest.desktop
@@ -1,6 +1,6 @@
 {
     "name": "BibleZ Beta",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "description": "BibleZ is an easy to use offline bible reader app for your Firefox! Enjoy the full bible at your fingertips. <b>Features:</b> <ul><li>many available bibles in different languages (e.g. ESV, KJV, NET (free version), ...)</li><li>notes</li><li>bookmarks</li><li>highlights</li><li>history of last read scriptures</li><li>no internet connection required (only for downloading modules)</li></ul> BibleZ is based on the SWORD Project (http://crosswire.org) and licenced under GPLv3. If you have any problems with this app just send an eMail to <a href:mailto:info@zefanjas.de>info@zefanjas.de</a>!",
     "launch_path": "/biblez-ng/app/index.html",
     "icons": {
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();
                 }
             }
         }));