aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--biblez.appcache2
m---------lib/layout0
m---------lib/onyx0
m---------lib/sword0
-rw-r--r--manifest.deploy2
-rw-r--r--manifest.desktop2
-rw-r--r--source/App.css1
-rw-r--r--source/App.js16
-rw-r--r--source/dataView.js4
-rw-r--r--source/main.js27
-rw-r--r--source/settings.js7
11 files changed, 42 insertions, 19 deletions
diff --git a/biblez.appcache b/biblez.appcache
index b9047a6..da47b13 100644
--- a/biblez.appcache
+++ b/biblez.appcache
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# v3 - 2014-01-31
+# v4 - 2014-02-01
CACHE:
icon.png
index.html
diff --git a/lib/layout b/lib/layout
-Subproject 9d11748d8dc3b68e6695c07ec76f0cc257d4472
+Subproject dfea40877018e0979ae897e3da01d7e46aaf6b8
diff --git a/lib/onyx b/lib/onyx
-Subproject 7956813945b0ced47fada839dbef1903c72252e
+Subproject 00ffdd236db829703b4d77a373aa53d525b97f1
diff --git a/lib/sword b/lib/sword
-Subproject 9b436c16aed5e9c0fc5a1a467230e35349a4fca
+Subproject 386675ab6df5050fded02a500f416ad296cc5ef
diff --git a/manifest.deploy b/manifest.deploy
index 8d68278..bff15b2 100644
--- a/manifest.deploy
+++ b/manifest.deploy
@@ -1,6 +1,6 @@
{
"name": "BibleZ",
- "version": "1.0.1",
+ "version": "1.2.0",
"description": "BibleZ is an easy to use offline bible reader app for your FirefoxOS device! 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": "/index.html",
"icons": {
diff --git a/manifest.desktop b/manifest.desktop
index da8d1df..edbd913 100644
--- a/manifest.desktop
+++ b/manifest.desktop
@@ -1,6 +1,6 @@
{
"name": "BibleZ Beta",
- "version": "1.1.0",
+ "version": "1.2.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 7b1cdbc..e1d047e 100644
--- a/source/App.css
+++ b/source/App.css
@@ -223,6 +223,7 @@ h3, h1 {
.settings-row {
padding: 5px;
+
}
/* NOTES */
diff --git a/source/App.js b/source/App.js
index 01b4886..d88d349 100644
--- a/source/App.js
+++ b/source/App.js
@@ -20,13 +20,13 @@ enyo.kind({
onOpenDataView: "openDataView",
onOpenAbout: "openAbout"
},
- {name: "moduleManager", kind: "biblez.moduleManager", onBack: "handleBack", onInstalled: "handleInstalledModule"},
{name: "bcSelector", kind: "biblez.bcSelector", onSelect: "handlePassageSelect", onBack: "handleBack"},
+ /*{name: "moduleManager", kind: "biblez.moduleManager", onBack: "handleBack", onInstalled: "handleInstalledModule"},
{name: "moduleManagerDesktop", kind: "biblez.moduleManagerDesktop", onBack: "handleBack", onInstalled: "handleInstalledModule"},
{name: "settings", kind: "biblez.settings", onBack: "handleBack", onChange: "handleSettings"},
{name: "notes", kind: "biblez.notes", onBack: "handleBack", onChange: "handleNote"},
{name: "dataView", kind: "biblez.dataView", onBack: "handleBack", onVerse: "handleVerse"},
- {name: "about", kind: "biblez.about", onBack: "handleBack"}
+ {name: "about", kind: "biblez.about", onBack: "handleBack"}*/
]}
],
@@ -40,6 +40,7 @@ enyo.kind({
handleBack: function (inSender, inEvent) {
this.$.panel.selectPanelByName("main");
+ enyo.asyncMethod(inSender, "destroy");
return true;
},
@@ -49,9 +50,11 @@ enyo.kind({
},
openModuleManager: function (inSender, inEvent) {
- if(!enyo.platform.firefoxOS)
+ if(!enyo.platform.firefoxOS) {
+ this.$.panel.createComponent({name: "moduleManagerDesktop", kind: "biblez.moduleManagerDesktop", onBack: "handleBack", onInstalled: "handleInstalledModule"}, {owner: this}).render();
this.$.panel.selectPanelByName("moduleManagerDesktop");
- else {
+ } else {
+ this.$.panel.createComponent({name: "moduleManager", kind: "biblez.moduleManager", onBack: "handleBack", onInstalled: "handleInstalledModule"}, {owner: this}).render();
this.$.panel.selectPanelByName("moduleManager");
this.$.moduleManager.start();
}
@@ -77,6 +80,7 @@ enyo.kind({
},
openPreferences: function (inSender, inEvent) {
+ this.$.panel.createComponent({name: "settings", kind: "biblez.settings", onBack: "handleBack", onChange: "handleSettings"}, {owner: this}).render();
this.$.settings.setSettings();
this.$.panel.selectPanelByName("settings");
},
@@ -86,6 +90,7 @@ enyo.kind({
},
openNotes: function (inSender, inEvent) {
+ this.$.panel.createComponent({name: "notes", kind: "biblez.notes", onBack: "handleBack", onChange: "handleNote"}, {owner: this}).render();
this.$.notes.setOsisRef(inEvent.osisRef);
this.$.notes.setNoteId(inEvent.noteId);
this.$.panel.selectPanelByName("notes");
@@ -97,17 +102,20 @@ enyo.kind({
},
openDataView: function (inSender, inEvent) {
+ this.$.panel.createComponent({name: "dataView", kind: "biblez.dataView", onBack: "handleBack", onVerse: "handleVerse"}, {owner: this}).render();
this.$.dataView.updateSection(inEvent.section);
this.$.panel.selectPanelByName("dataView");
},
handleVerse: function (inSender, inEvent) {
+ inSender.destroy();
this.$.main.handlePassage(inEvent.osisRef);
this.$.panel.selectPanelByName("main");
return true;
},
openAbout: function (inSender, inEvent) {
+ this.$.panel.createComponent({name: "about", kind: "biblez.about", onBack: "handleBack"}, {owner: this}).render();
this.$.panel.selectPanelByName("about");
}
});
diff --git a/source/dataView.js b/source/dataView.js
index 7edd7c2..4db82d2 100644
--- a/source/dataView.js
+++ b/source/dataView.js
@@ -22,10 +22,10 @@ enyo.kind({
{name: "noData", classes: "center", style: "margin-top: 10px;", showing: false},
{name: "dataList", kind: "List", fit: true, touch: true, onSetupItem: "setupItem", components: [
{name: "item", classes: "item", ontap: "handleListTap", components: [
- {kind: "enyo.FittableRows", components: [
+ //{kind: "enyo.FittableRows", components: [
{name: "itemOsis", classes: ""},
{name: "itemText", classes: "item-text", allowHtml: true}
- ]}
+ //]}
]}
]}
],
diff --git a/source/main.js b/source/main.js
index d24e9d3..ac8d98b 100644
--- a/source/main.js
+++ b/source/main.js
@@ -73,7 +73,7 @@ enyo.kind({
{kind: "onyx.Input", placeholder: "Enter a passage...", onchange: "handlePassage", name: "passageInput", value: "Matt 1"}
]}*/
]},
- {name: "mainPanel", kind: "Panels", fit: true, ondragfinish: "handleChangeChapter", onTransitionStart: "handlePanelIndex", arrangerKind: "LeftRightArranger", margin: 0, classes: "background", components: [
+ {name: "mainPanel", kind: "Panels", index: 2, fit: true, ondragfinish: "handleChangeChapter", onTransitionStart: "handlePanelIndex", arrangerKind: "LeftRightArranger", margin: 0, classes: "background", components: [
{},
{kind: "FittableColumns", noStretch: true, components: [
{fit: true},
@@ -88,12 +88,12 @@ enyo.kind({
{fit: true}
]},
{},
- {name: "firstStart", classes: "center", style: "margin-top: 20px;", components: [
+ /*{name: "firstStart", classes: "center", style: "margin-top: 20px;", components: [
{tag: "img", src: "assets/biblez128.png", style: "margin: 20px;"},
{content: $L("You have no modules installed. Open the Module Manager to install one."), style: "font-weight: bold; margin-bottom: 20px;"},
{kind: "onyx.Button", classes: "onyx-affirmative", content: $L("Open Module Manager"), ontap: "doOpenModuleManager"}
]},
- {}
+ {}*/
]},
],
@@ -113,7 +113,7 @@ enyo.kind({
this.inherited(arguments);
this.$.spinner.stop();
this.startUp();
- this.$.mainPanel.setIndexDirect(2);
+ //this.$.mainPanel.setIndexDirect(2);
},
startUp: function () {
@@ -156,17 +156,26 @@ enyo.kind({
sword.moduleMgr.getModules(enyo.bind(this, function(inError, inModules) {
if (!inError) {
if(inModules.length !== 0) {
- this.$.mainPanel.setIndex(2);
+ this.$.mainPanel.selectPanelByName("verseScroller");
this.$.mainPanel.draggable = true;
this.$.topTB.show();
this.modules = inModules;
this.renderModuleMenu(this.modules);
- this.$.firstStart.hide();
+ if(this.$.firstStart) {
+ this.$.firstStart.destroy();
+ this.$.endPlaceholder.destroy();
+ }
} else {
this.$.topTB.hide();
this.$.mainPanel.draggable = false;
- this.$.firstStart.show();
- this.$.mainPanel.setIndex(5);
+ this.$.mainPanel.createComponent({name: "firstStart", classes: "center", style: "margin-top: 20px;", components: [
+ {tag: "img", src: "assets/biblez128.png", style: "margin: 20px;"},
+ {content: $L("You have no modules installed. Open the Module Manager to install one."), style: "font-weight: bold; margin-bottom: 20px;"},
+ {kind: "onyx.Button", classes: "onyx-affirmative", content: $L("Open Module Manager"), ontap: "doOpenModuleManager"}
+ ]}, {owner: this}).render();
+ this.$.mainPanel.createComponent({name: "endPlaceholder"}, {owner: this}).render();
+ this.$.mainPanel.selectPanelByName("firstStart");
+ this.$.mainPanel.resized();
}
this.reflow();
} else {
@@ -255,7 +264,7 @@ enyo.kind({
this.$.btnPassage.setContent(this.currentPassage.label);
//Adjust the TB Icons
- this.$.topTB.reflow();
+ this.$.topTB.resized();
this.currentModule.renderText(this.currentPassage.osis,
{
oneVersePerLine: this.settings.linebreak ? true : false,
diff --git a/source/settings.js b/source/settings.js
index c15e0c7..e23af33 100644
--- a/source/settings.js
+++ b/source/settings.js
@@ -14,7 +14,7 @@ enyo.kind({
]},
{kind: "enyo.Scroller", touch: true, fit: true, components: [
{classes: "settings-container", components: [
- {kind: "onyx.Groupbox", components: [
+ {name: "container", kind: "onyx.Groupbox", components: [
{kind: "onyx.GroupboxHeader", content: $L("General")},
{kind: "enyo.FittableColumns", classes: "settings-row", components: [
{content: $L("Enable Linebreak"), classes: "settings-item", fit: true},
@@ -55,6 +55,11 @@ enyo.kind({
]}
],
+ rendered: function () {
+ this.inherited(arguments);
+ this.$.container.resized();
+ },
+
handleBack: function() {
this.doBack();
},
generated by cgit (git 2.34.1) at 2024-11-09 16:39:39 +0000