diff options
| m--------- | lib/sword | 0 | ||||
| -rw-r--r-- | source/App.js | 3 | ||||
| -rw-r--r-- | source/main.js | 4 | ||||
| -rw-r--r-- | source/moduleManager.js | 1 | ||||
| -rw-r--r-- | source/settings.js | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/lib/sword b/lib/sword -Subproject a20e9fb0dbbc894dbe087b9b31df759fb2e866b +Subproject 7420c0b47b03884e14a54631a1cb6bb8491afa1 diff --git a/source/App.js b/source/App.js index 0b4019c..2a77749 100644 --- a/source/App.js +++ b/source/App.js @@ -32,7 +32,8 @@ enyo.kind({ handleBack: function (inSender, inEvent) { this.$.panel.selectPanelByName("main"); - enyo.asyncMethod(inSender, "destroy"); + if(inSender.name !== "bcSelector") + enyo.asyncMethod(inSender, "destroy"); return true; }, diff --git a/source/main.js b/source/main.js index aa166cf..5f8b686 100644 --- a/source/main.js +++ b/source/main.js @@ -406,8 +406,8 @@ enyo.kind({ handleBcSelector: function (inSender, inEvent) { if(enyo.platform.firefox || enyo.platform.androidFirefox) { - this.$.bcPopup.showAtEvent(inEvent); - //this.$.bcSelector.setPanel(0); + //this.$.bcPopup.showAtEvent(inEvent); + this.doOpenBC(); } else this.doOpenBC(); }, diff --git a/source/moduleManager.js b/source/moduleManager.js index 0c5badb..44995de 100644 --- a/source/moduleManager.js +++ b/source/moduleManager.js @@ -268,6 +268,7 @@ enyo.kind({ this.doInstalled(); this.getInstalledModules(); } else { + console.log(inError); this.handleError(inError); } //console.log(inError, inModule); diff --git a/source/settings.js b/source/settings.js index c65655f..5789d9a 100644 --- a/source/settings.js +++ b/source/settings.js @@ -42,14 +42,14 @@ enyo.kind({ ]} ]}, - /*{tag: "br"}, + {tag: "br"}, {kind: "onyx.Groupbox", components: [ {kind: "onyx.GroupboxHeader", content: $L("Be careful!")}, {kind: "enyo.FittableRows", classes: "settings-row", components: [ {kind: "onyx.Button", content: "Delete all modules!", classes: "onyx-negative", style: "margin: 3px;", ontap: "deleteModules"}, {kind: "onyx.Button", content: "Delete all app data!", classes: "onyx-negative", style: "margin: 3px;", ontap: "deleteDatabases"} ]} - ]},*/ + ]}, ]} ]} |