828918 cant take picture #7606

Closed
wants to merge 29 commits into
from
Commits
Jump to file or symbol
Failed to load files and symbols.
+4 −4
Diff settings

Always

Just for now

View
@@ -634,7 +634,7 @@ var Camera = {
// A file with this name may have been written by the user or
// our indexeddb sequence tracker was cleared, check we wont overwrite
// anything
- var req = storage.get(path);
+ var req = storage.get(path + filename);
// A file existed, we bump the directory then try to generate a
// new filename
@@ -84,7 +84,7 @@ const Homescreen = (function() {
var confirm = {
callback: function onAccept() {
ConfirmDialog.hide();
- app.uninstall();
+ navigator.mozApps.mgmt.uninstall(app);
},
applyClass: 'danger'
};
View
@@ -323,7 +323,7 @@ var ApplicationsList = {
var name = new ManifestHelper(this._displayedApp.manifest).name;
if (confirm(_('uninstallConfirm', {app: name}))) {
- this._displayedApp.uninstall();
+ navigator.mozApps.mgmt.uninstall(this._displayedApp);
this._displayedApp = null;
}
},
View
@@ -197,7 +197,7 @@ var GaiaApps = {
*/
uninstallWithName: function(name) {
GaiaApps.locateWithName(name, function uninstall(app) {
- app.uninstall();
+ navigator.mozApps.mgmt.uninstall(app);
marionetteScriptFinished(false);
});
}