Attachment 211040 Details for Bug 370235 – Fix v1

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

[patch] Fix v1

clipboard.txt (text/plain), 1.54 KB, created by Szymon Brandys

on 2012-02-15 07:22:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Szymon Brandys

Created: 2012-02-15 07:22:22 EST

Size: 1.54 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>index ce575b4..286b1b4 100644
>--- a/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>+++ b/bundles/org.eclipse.orion.client.git/web/orion/git/gitCommands.js
>@@ -838,8 +838,9 @@
> 						display.Severity = "Ok";
> 						display.HTML = false;
> 						display.Message = result.jsonData.Result;
>-					}
>-					else if(result.jsonData){
>+						
>+						dojo.hitch(explorer, explorer.changedItem)(item);
>+					} else if(result.jsonData){
> 						var statusLocation = item.HeadLocation.replace("commit/HEAD", "status");
> 
> 						display.Severity = "Warning";
>@@ -860,7 +861,6 @@
> 							+ statusLocation + "\">Git Status page</a>.<span>";
> 					}
> 
>-					dojo.hitch(explorer, explorer.changedItem)(item);
> 					progressService.setProgressResult(display);
> 				}, function (error, ioArgs) {
> 						var display = [];
>@@ -901,6 +901,8 @@
> 						display.Severity = "Ok";
> 						display.HTML = false;
> 						display.Message = jsonData.Result;
>+						
>+						dojo.hitch(explorer, explorer.changedItem)(item);
> 					}
> 					// handle special cases
> 					else if (jsonData.Result == "STOPPED") {
>@@ -943,7 +945,7 @@
> 							+ ". Go to <a href=\"" + require.toUrl("git/git-status.html") + "#"
> 							+ statusLocation +"\">Git Status page</a>.<span>";
> 					} 
>-					dojo.hitch(explorer, explorer.changedItem)(item);
>+
> 					serviceRegistry.getService("orion.page.message").setProgressResult(display);
> 					}, 
> 					displayErrorOnStatus

Actions: View | Diff

Attachments on bug 370235: 211040