Attachment 209193 Details for Bug 367108 – Fix v01 (client)

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

[patch] Fix v01 (client)

apply_patch_from_url--client.patch (text/plain), 3.57 KB, created by Tomasz Zarna

on 2012-01-09 04:44:17 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2012-01-09 04:44:17 EST

Size: 3.57 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 579956e..47651ff 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
>@@ -33,7 +33,24 @@ dojo.declare("orion.git.widgets.ApplyPatchDialog", [ dijit.Dialog, orion.widgets
> 		dojo.byId("applyPatchDialog.uploader").url = this.options.diffLocation;
> 
> 		var self = this;
>-		
>+
>+		function toogle(disableFile) {
>+			dijit.byId("files").set("disabled", disableFile);
>+			dijit.byId("applyPatchDialog.uploader").set("disabled", disableFile);
>+			dijit.byId("applyPatchDialog.url").set("disabled", !disableFile);
>+		}
>+		toogle(true);
>+
>+		dojo.connect(dijit.byId("applyPatchDialog.urlRadio"), "onclick", dojo.hitch(this, function(dataArray) {
>+			if (dataArray.target.id === "applyPatchDialog.urlRadio")
>+				toogle(true);
>+		}));
>+
>+		dojo.connect(dijit.byId("applyPatchDialog.fileRadio"), "onclick", dojo.hitch(this, function(dataArray) {
>+			if (dataArray.target.id === "applyPatchDialog.fileRadio")
>+				toogle(false);
>+		}));
>+
> 		dojo.connect(dijit.byId("applyPatchDialog.uploader"), "onError", dojo.hitch(this, function(dataArray) {
> 			setTimeout(dojo.hitch(this, function(){
> 				this.hide();
>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/ApplyPatchDialog.html b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/ApplyPatchDialog.html
>index ff6f9a9..db35661 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/ApplyPatchDialog.html
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/widgets/templates/ApplyPatchDialog.html
>@@ -9,19 +9,31 @@
> 		
> 
> 		<form method="post" id="applyPatchDialog.myForm"
>-			enctype="multipart/form-data" >
>+			enctype="multipart/form-data">
> 			<fieldset>
> 				<div style="display: table-row">
> 					<div style="display: table-row; height: 20px">
> 						<div style="display: table-cell; padding: 1px;">
>-							Patch:
>+							<input type="radio" name="radio" value="urlRadio" id="applyPatchDialog.urlRadio" checked/>URL:
>+						</div>
>+						<div style="display: table-cell; padding: 1px;">
>+							<input type="text" name="url" id="applyPatchDialog.url"
>+								dojoType="dijit.form.ValidationTextBox"
>+								regExp="^http(s)*://.+" invalidMessage="Invalid URL."/>
>+						</div>
>+						<div style="display: table-cell; padding: 1px;">
>+						</div>
>+					</div>
>+					<div style="display: table-row; height: 20px">
>+						<div style="display: table-cell; padding: 1px;">
>+							<input type="radio" name="radio" value="fileRadio" id="applyPatchDialog.fileRadio"/>File:
> 						</div>
> 						<div style="display: table-cell; padding: 1px; vertical-align: top;">
> 							<div id="files" dojoType="dojox.form.uploader.FileList" uploaderId="applyPatchDialog.uploader"></div>
> 						</div>
> 						<div style="display: table-cell; padding: 1px;">
> 							<input name="uploadedfile" multiple="false" type="file" id="applyPatchDialog.uploader" force="iframe"
>-								dojoType="dojox.form.Uploader" style="height: 20px" label="Browse..." >
>+								dojoType="dojox.form.Uploader" style="height: 20px" label="Browse..."/>
> 						</div>
> 					</div>
> 					<div style="display: table-row">
>@@ -34,8 +46,8 @@
> 								style="padding: 20 0 10 0; float: right; clear: both;"/>
> 						</div>
> 					</div>
>-				</div>	
>+				</div>
> 			</fieldset>
> 		</form>
> 	</div>
>-</div>
>+</div>
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 367108: 209193 | 209194