Attachment 254094 Details for Bug 467987 – patch.txt

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch.txt

patch.txt (text/plain), 4.45 KB, created by Carolyn MacLeod

on 2015-06-03 14:53:29 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carolyn MacLeod

Created: 2015-06-03 14:53:29 EDT

Size: 4.45 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>index c5c12da..a414da3 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/explorers/explorer-table.js
>@@ -435,7 +435,7 @@
> 				var dragEnter = function (evt) {
> 					if (dragStartTarget) {
> 						var copy = util.isMac ? evt.altKey : evt.ctrlKey;
>-						dropEffect = evt.dataTransfer.dropEffect = copy ? "copy" : "move"; //$NON-NLS-1$ //$NON-NLS-0$
>+						dropEffect = evt.dataTransfer.dropEffect = (copy ? "copy" : "move"); //$NON-NLS-1$ //$NON-NLS-0$
> 					} else {
> 						/* accessing dataTransfer.effectAllowed here throws an error on IE */
> 						if (!util.isIE && (evt.dataTransfer.effectAllowed === "all" ||   //$NON-NLS-0$
>@@ -459,7 +459,7 @@
> 				var dragOver = function (evt) {
> 					if (dragStartTarget) {
> 						var copy = util.isMac ? evt.altKey : evt.ctrlKey;
>-						dropEffect = evt.dataTransfer.dropEffect = copy ? "copy" : "move"; //$NON-NLS-1$ //$NON-NLS-0$
>+						dropEffect = evt.dataTransfer.dropEffect = (copy ? "copy" : "move"); //$NON-NLS-1$ //$NON-NLS-0$
> 					} else {
> 						// default behavior is to not trigger a drop, so we override the default
> 						// behavior in order to enable drop.  
>@@ -641,7 +641,20 @@
> 						deferred.then(function(result) {
> 							var dispatcher = explorer.modelEventDispatcher;
> 							dispatcher.dispatchEvent({type: isCopy ? "copy" : "move", oldValue: source, newValue: result, parent: item}); //$NON-NLS-1$ //$NON-NLS-0$
>-						}, errorHandler);
>+						}, function(error) {
>+							if (error.status === 400 || error.status === 412) {
>+								var resp = error.responseText;
>+								if (typeof resp === "string") {
>+									try {
>+										resp = JSON.parse(resp);
>+										resp.Message = messages[isCopy ? "CopyFailed" : "MoveFailed"];
>+										error = resp;
>+									} catch(error) {}
>+								}
>+							}
>+							errorHandler(error);
>+						}
>+					);
> 						
> 					// webkit supports testing for and traversing directories
> 					// http://wiki.whatwg.org/wiki/DragAndDropEntries
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>index 2f8f6ed..0599074 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/fileCommands.js
>@@ -300,7 +300,19 @@
> 						dispatchModelEventOn({type: "create", parent: loadedWorkspace, newValue: folder }); //$NON-NLS-0$
> 					}, errorHandler);
> 				}, 
>-				errorHandler);
>+				function(error) {
>+					if (error.status === 400 || error.status === 412) {
>+						var resp = error.responseText;
>+						if (typeof resp === "string") {
>+							try {
>+								resp = JSON.parse(resp);
>+								resp.Message = i18nUtil.formatMessage(messages["FailedToCreateProject"], name);
>+								error = resp;
>+							} catch(error) {}
>+						}
>+					}
>+					errorHandler(error);
>+				});
> 			}, errorHandler);
> 		}
> 	}
>@@ -918,7 +930,20 @@
> 						function(newArtifact) {
> 							dispatchModelEvent({ type: "create", parent: parentItem, newValue: newArtifact }); //$NON-NLS-0$
> 						},
>-						errorHandler);
>+						function(error) {
>+							if (error.status === 400 || error.status === 412) {
>+								var resp = error.responseText;
>+								if (typeof resp === "string") {
>+									try {
>+										resp = JSON.parse(resp);
>+										resp.Message = i18nUtil.formatMessage(messages["FailedToCreateFile"], name);
>+										error = resp;
>+									} catch(error) {}
>+								}
>+							}
>+							errorHandler(error);
>+						}
>+					);
> 				}
> 			};
> 			
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js b/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>index 6ebc599..ffdc5e1 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/navigate/nls/root/messages.js
>@@ -34,6 +34,10 @@
> 	"ZipDL": "Create a zip file of the folder contents and download it",
> 	"New File": "File",
> 	"Create a new file": "Create a new file",
>+	"FailedToCreateProject":"Failed to create project: ${0}",
>+	"FailedToCreateFile": "Failed to create file: ${0}",
>+	"CopyFailed": "Copy operation failed",
>+	"MoveFailed": "Move operation failed",
> 	"Name:": "Name:",
> 	"New Folder": "Folder",
> 	"Folder name:": "Folder name:",

Actions: View | Diff

Attachments on bug 467987: 253670 | 254094