Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 04:26:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #97 from birarda/atp-mappings

Browse source 
don't default to yes when prompted for overwrite
This commit is contained in:
Clément Brisset 2016-03-10 15:57:57 -08:00
commit 37449613b7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/AssetServer.qml
View file

@ -91,11 +91,11 @@ Window {
return Assets.isKnownMapping(path);
}
function askForOverride(path, callback) {
function askForOverwrite(path, callback) {
var object = desktop.messageBox({
icon: hifi.icons.question,
buttons: OriginalDialogs.StandardButton.Yes | OriginalDialogs.StandardButton.No,
defaultButton: OriginalDialogs.StandardButton.Yes,
defaultButton: OriginalDialogs.StandardButton.No,
title: "Overwrite File",
text: path + "\n" + "This file already exists. Do you want to overwrite it?"
});
@ -167,7 +167,7 @@ Window {
return;
}
if (fileExists(destinationPath)) {
askForOverride(destinationPath, function() {
askForOverwrite(destinationPath, function() {
doRenameFile(path, destinationPath);
});
} else {
@ -229,7 +229,7 @@ Window {
Assets.uploadFile(fileUrl, directory + filename, function(err) {
if (err) {
console.log("Error uploading: ", fileUrl, " - error ", err);
errorMessage("There was an error uploading:\n" + fileUrl + "\n\nPlease try again.");
errorMessage("There was an error uploading:\n" + fileUrl + "\n" + Assets.getErrorString(err));
} else {
console.log("Finished uploading: ", fileUrl);
}