diff options
| -rwxr-xr-x | buildApp.sh | 6 | ||||
| m--------- | enyo | 0 | ||||
| m--------- | lib/layout | 0 | ||||
| m--------- | lib/onyx | 0 | ||||
| -rw-r--r-- | source/App.js | 8 | ||||
| -rw-r--r-- | source/main.js | 13 |
6 files changed, 10 insertions, 17 deletions
diff --git a/buildApp.sh b/buildApp.sh index c129f15..c3399fb 100755 --- a/buildApp.sh +++ b/buildApp.sh @@ -1,10 +1,10 @@ #!/bin/sh -echo "Building for firefoxOS..." +echo "\033[1;32mBuilding for firefoxOS...\033[0m" sh tools/deploy.sh cp manifest.deploy deploy/biblez-ng/manifest.webapp cd deploy/biblez-ng/ -zip -r ../biblez.zip ./ -echo "Building for Firefox" +zip -r -q ../biblez.zip ./ +echo "\033[1;32mBuilding for Firefox\033[0m" cd ../.. sh tools/deploy.sh -o github/app cp manifest.desktop github/app/manifest.webapp diff --git a/enyo b/enyo -Subproject ad50ee2de0a568a4826c11f931a7aa209c30916 +Subproject 4992cf7de678e059bfc9aabd74d792316b95a9d diff --git a/lib/layout b/lib/layout -Subproject dfea40877018e0979ae897e3da01d7e46aaf6b8 +Subproject 7ff26bf0439d5512d2b70c2d0411d5c283bc661 diff --git a/lib/onyx b/lib/onyx -Subproject 00ffdd236db829703b4d77a373aa53d525b97f1 +Subproject 35e2ccdd2e3eb2e11ac2922ae361d3d655209fd diff --git a/source/App.js b/source/App.js index d88d349..0b4019c 100644 --- a/source/App.js +++ b/source/App.js @@ -30,14 +30,6 @@ enyo.kind({ ]} ], - handlePanels: function (inSender, inEvent) { - if(inEvent.toIndex === 1 && enyo.platform.firefoxOS) { - this.$.moduleManager.start(); - } - return true; - - }, - handleBack: function (inSender, inEvent) { this.$.panel.selectPanelByName("main"); enyo.asyncMethod(inSender, "destroy"); diff --git a/source/main.js b/source/main.js index ec7e571..7ef36a8 100644 --- a/source/main.js +++ b/source/main.js @@ -43,28 +43,28 @@ enyo.kind({ {kind: "onyx.IconButton", src: "assets/bookmarks.png"}, {content: $L("Bookmarks"), classes: "menu-label"} ]}, - {action: "notes", components: [ + {action: "notes", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/notes.png"}, {content: $L("Notes"), classes: "menu-label"} ]}, - {action: "highlights", components: [ + {action: "highlights", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/highlights.png"}, {content: $L("Highlights"), classes: "menu-label"} ]}, {classes: "onyx-menu-divider"}, - {action: "moduleManager", components: [ + {action: "moduleManager", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/add.png"}, {content: $L("Module Manager"), classes: "menu-label"} ]}, - {action: "preferences", components: [ + {action: "preferences", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/settings.png"}, {content: $L("Preferences"), classes: "menu-label"} ]}, - {action: "font", components: [ + {action: "font", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/font.png"}, {content: $L("Font"), classes: "menu-label"} ]}, - {action: "about", components: [ + {action: "about", classes: "menu-item", components: [ {kind: "onyx.IconButton", src: "assets/info.png"}, {content: $L("About"), classes: "menu-label"} ]} @@ -439,6 +439,7 @@ enyo.kind({ } this.$.mainPanel.setIndexDirect(2); } + return true; }, handleVerseTap: function (inSender, inEvent) { |