Attachment 251451 Details for Bug 392359 – revised attachment w txt extension

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

[patch] revised attachment w txt extension

patch_applypatchdialog.txt (text/plain), 1.90 KB, created by Marynia Kolak

on 2015-03-11 00:52:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Marynia Kolak

Created: 2015-03-11 00:52:34 EDT

Size: 1.90 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
>index 5c2e645..f9e58bc 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/ApplyPatchDialog.js
>@@ -22,7 +22,7 @@
> 	ApplyPatchDialog.prototype.TEMPLATE =
> 
> 	'<div style="padding:4px"><input type="radio" name="radio" value="urlRadio" id="urlRadio" checked/>' +
>-		messages["URL:"] + '<input type="text" name="url" id="url"/></div>' +
>+		messages["URL:"] + '<input type="text" name="url" id="patchurl"/></div>' +
> 	'<div style="padding:4px"><input type="radio" name="radio" value="fileRadio" id="fileRadio"/>' +
> 		messages["File:"] + '<input type="file" name="selectedFile" id="selectedFile" class="uploadChooser" />' +
> 	'</div>';
>@@ -34,6 +34,7 @@
> 		this.modal = true;
> 		this.messages = messages;
> 		this.options = options;
>+		this.customFocus = true;
> 
> 		this.buttons = [];
> 
>@@ -49,20 +50,22 @@
> 	};
> 
> 	ApplyPatchDialog.prototype._bindToDom = function(parent) {
>+		var urlField = this.$patchurl;
> 		this.$selectedFile.onchange = function(event){
> 			this.$urlRadio.checked = false;
> 			this.$fileRadio.checked = "fileRadio";
> 		}.bind(this);
>-		this.$url.onchange = function(event){
>+		this.$patchurl.onchange = function(event){
> 			this.$urlRadio.checked = "urlRadio";
> 			this.$fileRadio.checked = false;
> 		}.bind(this);
>+		window.setTimeout(function () {urlField.focus();}, 0);
> 	};
> 
> 	ApplyPatchDialog.prototype._applyPatch = function(parent) {
> 		var formData = new FormData();
> 		formData.append("uploadedfile", this.$selectedFile.files[0]);
>-		formData.append("url", this.$url.value);
>+		formData.append("url", this.$patchurl.value);
> 		formData.append("radio", this.$fileRadio.checked ? "fileRadio" : "urlRadio");
> 
> 		this.req = new XMLHttpRequest();

Actions: View | Diff

Attachments on bug 392359: 244062 | 251450 | 251451