diff options
| m--------- | enyo | 0 | ||||
| m--------- | lib/layout | 0 | ||||
| m--------- | lib/onyx | 0 | ||||
| -rw-r--r-- | source/App.css | 18 | ||||
| -rw-r--r-- | source/App.js | 25 | ||||
| -rw-r--r-- | source/bcSelector.js | 6 | ||||
| -rw-r--r-- | source/main.js | 6 | ||||
| -rw-r--r-- | source/popup.js | 8 |
8 files changed, 34 insertions, 29 deletions
diff --git a/enyo b/enyo -Subproject a2da7e92bde1ab716b7be673b1a923c31532052 +Subproject 71c24bea67806591a6ff6f40bbce9d27b96ae0f diff --git a/lib/layout b/lib/layout -Subproject 564448f5996315f9c8e1ab8fb3e1086727bc9b9 +Subproject 10c70b926a9739348792b9ee8c40dfb3744ce38 diff --git a/lib/onyx b/lib/onyx -Subproject 27c6dd3fcee419f23cf369a18b3b0bccce2375a +Subproject 69ea7023093b8d56c0e68ae4410df123bade74d diff --git a/source/App.css b/source/App.css index a6720b8..4e5d53a 100644 --- a/source/App.css +++ b/source/App.css @@ -5,7 +5,6 @@ .background { background: url("../assets/oldPaper.png"); background-size: 100%; - } .app-panels > * { @@ -61,8 +60,8 @@ } .biblez-bc-popup { - height: 480px; - width: 495px; + height: 450px; + width: 465px; } .tb-button { @@ -118,15 +117,16 @@ /* BOOK CHAPTER SELECTOR */ .bc-item { - height: 30px; - width: 45px; - margin: 3px; - /* border: 1px solid #ccc; */ + /* padding: 5px 5px 5px 5px; - float: left; + line-height: 30px; - text-align: center; + text-align: center;*/ + height: 44px; + width: 47px; + margin: 3px; font-weight: bold; + float: left; } .books-ot { diff --git a/source/App.js b/source/App.js index b0236a5..01b4886 100644 --- a/source/App.js +++ b/source/App.js @@ -30,11 +30,6 @@ enyo.kind({ ]} ], - rendered: function () { - this.inherited(arguments); - //this.$.panel.setIndex(1); - }, - handlePanels: function (inSender, inEvent) { if(inEvent.toIndex === 1 && enyo.platform.firefoxOS) { this.$.moduleManager.start(); @@ -44,7 +39,7 @@ enyo.kind({ }, handleBack: function (inSender, inEvent) { - this.$.panel.setIndex(0); + this.$.panel.selectPanelByName("main"); return true; }, @@ -55,9 +50,9 @@ enyo.kind({ openModuleManager: function (inSender, inEvent) { if(!enyo.platform.firefoxOS) - this.$.panel.setIndex(3); + this.$.panel.selectPanelByName("moduleManagerDesktop"); else { - this.$.panel.setIndex(1); + this.$.panel.selectPanelByName("moduleManager"); this.$.moduleManager.start(); } @@ -65,7 +60,7 @@ enyo.kind({ }, openSelector: function (inSender, inEvent) { - this.$.panel.setIndex(2); + this.$.panel.selectPanelByName("bcSelector"); this.$.bcSelector.setPanel(0); return true; }, @@ -76,14 +71,14 @@ enyo.kind({ }, handlePassageSelect: function (inSender, inEvent) { - this.$.panel.setIndex(0); + this.$.panel.selectPanelByName("main"); delete inEvent.originator; this.$.main.setPassage(inEvent); }, openPreferences: function (inSender, inEvent) { this.$.settings.setSettings(); - this.$.panel.setIndex(4); + this.$.panel.selectPanelByName("settings"); }, handleSettings: function (inSender, inEvent) { @@ -93,7 +88,7 @@ enyo.kind({ openNotes: function (inSender, inEvent) { this.$.notes.setOsisRef(inEvent.osisRef); this.$.notes.setNoteId(inEvent.noteId); - this.$.panel.setIndex(5); + this.$.panel.selectPanelByName("notes"); }, handleNote: function (inSender, inEvent) { @@ -103,17 +98,17 @@ enyo.kind({ openDataView: function (inSender, inEvent) { this.$.dataView.updateSection(inEvent.section); - this.$.panel.setIndex(6); + this.$.panel.selectPanelByName("dataView"); }, handleVerse: function (inSender, inEvent) { this.$.main.handlePassage(inEvent.osisRef); - this.$.panel.setIndex(0); + this.$.panel.selectPanelByName("main"); return true; }, openAbout: function (inSender, inEvent) { - this.$.panel.setIndex(7); + this.$.panel.selectPanelByName("about"); } }); diff --git a/source/bcSelector.js b/source/bcSelector.js index 25c59ac..43a5231 100644 --- a/source/bcSelector.js +++ b/source/bcSelector.js @@ -10,7 +10,7 @@ enyo.kind({ module: null }, components: [ - {name: "bcPanel", kind: "Panels", arrangerKind: "CardArranger", animate: false, fit: true, components: [ + {name: "bcPanel", kind: "Panels", arrangerKind: "CardArranger", fit: true, animate: false, components: [ {name: "bookPanel", kind: "enyo.FittableRows", components: [ {kind: "onyx.Toolbar", components: [ {kind: "onyx.IconButton", src: "assets/back.png", ontap: "doBack"}, @@ -18,7 +18,7 @@ enyo.kind({ ]}, {kind: "enyo.Scroller", fit: true, touch: true, components: [ {name: "bookRepeater", kind: "Repeater", count: 0, onSetupItem: "setBookItems", components: [ - {name: "bookItem", classes: "bc-item onyx-button", ontap: "handleBook"} + {name: "bookItem", kind: "onyx.Button", classes: "bc-item", ontap: "handleBook"} ]} ]} ]}, @@ -29,7 +29,7 @@ enyo.kind({ ]}, {kind: "enyo.Scroller", fit: true, touch: true, components: [ {name: "chapterRepeater", kind: "Repeater", count: 0, onSetupItem: "setChapterItems", components: [ - {name: "chapterItem", classes: "bc-item onyx-button", ontap: "handleChapter"} + {name: "chapterItem", kind: "onyx.Button", classes: "bc-item", ontap: "handleChapter"} ]} ]} ]} diff --git a/source/main.js b/source/main.js index 150ed81..25fcb9e 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.crossReferences === "headings") + if(inEvent.setting === "linebreak" || inEvent.setting === "footnotes" || inEvent.setting === "headings" || inEvent.setting === "crossReferences") this.handlePassage(); } else { this.handleError("Couldn't load settings!"); @@ -486,11 +486,13 @@ enyo.kind({ })); this.$.footnotePopup.showAtEvent(inEvent); } else if (attributes.type === "crossReference") { + this.$.footnotePopup.showAtEvent(inEvent); + this.$.footnotePopup.handleSpinner(true); this.currentModule.renderText(attributes.osisRef, {oneVersePerLine: false, footnotes: false, headings: false}, enyo.bind(this, function (inError, inResult) { if(!inError) { this.$.footnotePopup.setText(inResult.text); - this.$.footnotePopup.showAtEvent(inEvent); + this.$.footnotePopup.handleSpinner(false); } else { this.$.footnotePopup.hide(); this.handleError(inError.message); diff --git a/source/popup.js b/source/popup.js index 5705ea1..c06755a 100644 --- a/source/popup.js +++ b/source/popup.js @@ -222,10 +222,18 @@ enyo.kind({ }, components:[ {kind: "enyo.Scroller", touch: true, fit: true, classes: "note-popup", components: [ + {name: "spinner", kind: "onyx.Spinner", showing: false}, {name: "noteText", content: "", allowHtml: true, onclick: "handleTap"} ]} ], + handleSpinner: function (inShow) { + if(inShow) + this.$.spinner.show(); + else + this.$.spinner.hide(); + }, + textChanged: function () { this.$.noteText.setContent(this.text); }, |