* added Cross-Reference setting

5 files changed, 20 insertions, 4 deletions

diff --git a/lib/sword b/lib/sword
-Subproject 746decabe924f70bc509e5d763ed11a2fb400aa
+Subproject 2726bdb6b6409f20ccb5ff1614345cec444e5a3
diff --git a/source/App.css b/source/App.css
index 87c4133..a6720b8 100644
--- a/source/App.css
+++ b/source/App.css
@@ -232,6 +232,10 @@ h3, h1 {
     max-height: 300px;
 }
 
+.note-popup a {
+    color: #eee;
+}
+
 /* DATA VIEW */
 .data-view-back {
     position: absolute;
diff --git a/source/main.js b/source/main.js
index 1b162de..150ed81 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")
+                if(inEvent.setting === "linebreak" || inEvent.setting === "footnotes" || inEvent.setting === "headings" || inEvent.crossReferences === "headings")
                     this.handlePassage();
             } else {
                 this.handleError("Couldn't load settings!");
@@ -258,8 +258,9 @@ enyo.kind({
         this.$.topTB.reflow();
         this.currentModule.renderText(this.currentPassage.osis,
             {
-                oneVersePerLine: this.settings.linebreak ? this.settings.linebreak : false,
-                footnotes: this.settings.footnotes ? this.settings.footnotes : false,
+                oneVersePerLine: this.settings.linebreak ? true : false,
+                footnotes: this.settings.footnotes ? true : false,
+                crossReferences: this.settings.crossReferences ? true : false,
                 headings: this.settings.hasOwnProperty("headings") ? this.settings.headings : true,
             },
             enyo.bind(this, function (inError, inResult) {
diff --git a/source/popup.js b/source/popup.js
index 3131deb..5705ea1 100644
--- a/source/popup.js
+++ b/source/popup.js
@@ -222,11 +222,16 @@ enyo.kind({
     },
     components:[
         {kind: "enyo.Scroller", touch: true, fit: true, classes: "note-popup", components: [
-            {name: "noteText", content: "", allowHtml: true}
+            {name: "noteText", content: "", allowHtml: true, onclick: "handleTap"}
         ]}
     ],
 
     textChanged: function () {
         this.$.noteText.setContent(this.text);
+    },
+
+    handleTap: function (inSender, inEvent) {
+        inEvent.preventDefault();
+        return true;
     }
 });
\ No newline at end of file
diff --git a/source/settings.js b/source/settings.js
index c2b532c..a3f457c 100644
--- a/source/settings.js
+++ b/source/settings.js
@@ -27,6 +27,10 @@ enyo.kind({
                     {kind: "enyo.FittableColumns", classes: "settings-row", components: [
                         {content: $L("Enable Footnotes"), classes: "settings-item", fit: true},
                         {name: "tbFootnote", key: "footnotes", kind: "onyx.ToggleButton", onChange: "handleSettings"}
+                    ]},
+                    {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"}
                     ]}
 
                 ]},
@@ -57,6 +61,8 @@ enyo.kind({
                     this.$.tbHeadings.updateVisualState();
                     this.$.tbFootnote.value = inSettings.hasOwnProperty("footnotes") ? inSettings.footnotes : false;
                     this.$.tbFootnote.updateVisualState();
+                    this.$.tbCrossRef.value = inSettings.hasOwnProperty("crossReferences") ? inSettings.crossReferences : false;
+                    this.$.tbCrossRef.updateVisualState();
                 }
             }
         }));