Added Dialog prompt for single file import

mozilla · May 12, 2017 · 25bfe6b · 25bfe6b
1 parent 95a8006
commit 25bfe6b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/locales/en-US/editor.properties b/locales/en-US/editor.properties
@@ -21,6 +21,7 @@ DIRECTORY_NAME=Directory Name
 
 # File Open/Save Error strings
 
+FILE_EXISTS_HEADER=The file already exists.
 # The {0} here will be replaced by an actual error message
 OPEN_DIALOG_ERROR=An error occurred when showing the open file dialog. (error {0})
 # {0} will be replaced with a filename and {1} will be replaced by an error message
@@ -94,6 +95,8 @@ SAVE_AND_OVERWRITE=Overwrite
 DELETE=Delete
 BUTTON_YES=Yes
 BUTTON_NO=No
+USE_IMPORTED=Use Imported
+KEEP_EXISTING=Keep Existing
 
 # Quick Edit
 
@@ -136,6 +139,7 @@ DND_SUCCESS_UNTAR_TITLE=Untar Completed Successfully
 DND_SUCCESS_UNZIP=Successfully unzipped <b>{0}</b>.
 # {0} will be replaced by a tar filename
 DND_SUCCESS_UNTAR=Successfully untarred <b>{0}</b>.
+DND_FILE_REPLACE=A file named \"{0}\" already exists in this location. Do you want to use the imported file or keep the existing?
 
 # Image Viewer
 IMAGE_DIMENSIONS={0} (width) &times; {1} (height) pixels

diff --git a/src/utils/DragAndDrop.js b/src/utils/DragAndDrop.js
@@ -47,6 +47,7 @@ define(function (require, exports, module) {
     // this is the path they want to use as a parent dir root.
     var _dropPathHint;
 
+
     /**
      * Returns true if the drag and drop items contains valid drop objects.
      * @param {Array.<DataTransferItem>} items Array of items being dragged

diff --git a/src/widgets/Dialogs.js b/src/widgets/Dialogs.js
@@ -43,6 +43,7 @@ define(function (require, exports, module) {
         DIALOG_BTN_OK               = "ok",
         DIALOG_BTN_DONTSAVE         = "dontsave",
         DIALOG_BTN_SAVE_AS          = "save_as",
+        DIALOG_BTN_IMPORT           = "import",
         DIALOG_CANCELED             = "_canceled",
         DIALOG_BTN_DOWNLOAD         = "download";
 
@@ -443,6 +444,7 @@ define(function (require, exports, module) {
     window.addEventListener("resize", setDialogMaxSize);
 
     exports.DIALOG_BTN_CANCEL            = DIALOG_BTN_CANCEL;
+    exports.DIALOG_BTN_IMPORT            = DIALOG_BTN_IMPORT;
     exports.DIALOG_BTN_OK                = DIALOG_BTN_OK;
     exports.DIALOG_BTN_DONTSAVE          = DIALOG_BTN_DONTSAVE;
     exports.DIALOG_BTN_SAVE_AS           = DIALOG_BTN_SAVE_AS;