Attachment 236570 Details for Bug 419637 – test patch file

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

test patch file

patch.txt (text/plain), 3.79 KB, created by Grant Gayed

on 2013-10-16 16:45:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Grant Gayed

Created: 2013-10-16 16:45:16 EDT

Size: 3.79 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js b/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js
>index d1c0314..c82bfd0 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js
>@@ -43,7 +43,7 @@
> 		nameKey: "Shell",
> 		id: "orion.shell",
> 		nls: "orion/nls/messages",
>-		uriTemplate: "{OrionHome}/shell/shellPage.html#projectfor={Location}"
>+		uriTemplate: "{OrionHome}/shell/shellPage.html"
> 	});
> 	provider.registerService("orion.page.link", serviceImpl, {
> 		nameKey: "Search",
>diff --git a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>index 5957d7e..8746bc6 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/shell/shellPage.js
>@@ -26,7 +26,6 @@
> 	var contentTypeService, openWithCommands = [], serviceRegistry;
> 	var pluginRegistry, pluginType, preferences, serviceElementCounter = 0;
> 
>-	var PREFIX_PROJECTFOR = "projectfor="; //$NON-NLS-0$
> 	var ROOT_ORIONCONTENT = new URL(require.toUrl("file"), window.location.href).pathname; //$NON-NLS-0$
> 	var PAGE_TEMPLATE = require.toUrl("shell/shellPage.html") + "#{,resource}"; //$NON-NLS-0$
> 
>@@ -914,8 +913,6 @@
> 
> 		shell.setFocusToInput();
> 
>-		/* check the URL for an initial folder location to open to */
>-
> 		shellPageFileService = new mShellPageFileService.ShellPageFileService();
> 		var defaultLocationFn = function(location, replace) {
> 			var successFn = function(node) {
>@@ -935,40 +932,7 @@
> 				shellPageFileService.loadWorkspace(ROOT_ORIONCONTENT).then(successFn);
> 			}
> 		};
>-
>-		if (parameters.resource && parameters.resource.indexOf(PREFIX_PROJECTFOR) === 0) {
>-			/* Attempt to open to the project root of the specified resource */
>-			var resourceValue = parameters.resource.substring(PREFIX_PROJECTFOR.length);
>-			fileClient.read(resourceValue, true).then(
>-				function(node) {
>-					if (node.Directory === undefined) {
>-						/*
>-						 * The resource was read successfully but does not represent a file system
>-						 * resource, so it cannot be used.  Revert to the default initial location.
>-						 */
>-						 defaultLocationFn(null, true);
>-					} else if (node.Parents && node.Parents.length > 0) {
>-						var projectLocation = node.Parents[node.Parents.length - 1].Location;
>-						defaultLocationFn(projectLocation, true);
>-					} else {
>-						/*
>-						 * The PREFIX_PROJECTFOR value is either a project root or is below the
>-						 * level or projects, so just take it as the starting location.
>-						 */
>-						 defaultLocationFn(node.Location, true);
>-					}
>-				},
>-				function(error) {
>-					/*
>-					 * The PREFIX_PROJECTFOR value does not refer to a valid file system
>-					 * location, so open to the default location.
>-					 */
>-					defaultLocationFn(null, true);			
>-				}
>-			);
>-		} else {
>-			defaultLocationFn(getCWD(), true);
>-		}
>+		defaultLocationFn(getCWD(), true);
> 
> 		/* add the locally-defined types */
> 		fileType = new mFileParamType.ParamTypeFile(shellPageFileService);
>diff --git a/modules/orionode/lib/orionode.client/plugins/pageLinksPlugin.js b/modules/orionode/lib/orionode.client/plugins/pageLinksPlugin.js
>index f93a986..629e832 100644
>--- a/modules/orionode/lib/orionode.client/plugins/pageLinksPlugin.js
>+++ b/modules/orionode/lib/orionode.client/plugins/pageLinksPlugin.js
>@@ -51,7 +51,7 @@
> 		nameKey: "Shell",
> 		id: "orion.shell",
> 		nls: "orion/nls/messages",
>-		uriTemplate: "{OrionHome}/shell/shellPage.html#projectfor={Location}"
>+		uriTemplate: "{OrionHome}/shell/shellPage.html"
> 	});
> 	provider.registerService("orion.page.link", serviceImpl, {
> 		nameKey: "Search",

Actions: View

Attachments on bug 419637: 236570