Attachment 236375 Details for Bug 419154 – Second patch after Mark's first refview

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

Second patch after Mark's first refview

patch419154_2.txt (text/plain), 2.15 KB, created by libing wang

on 2013-10-11 10:22:02 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: libing wang

Created: 2013-10-11 10:22:02 EDT

Size: 2.15 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js b/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>index a58a76b..b647093 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/searchUtils.js
>@@ -137,6 +137,9 @@
> 	if(typeof searchParams.nameSearch === "string"){ //$NON-NLS-0$
> 		searchParams.nameSearch = (searchParams.nameSearch.toLowerCase() === "true"); //$NON-NLS-0$
> 	}
>+	if(typeof searchParams.useRootLocation === "string"){ //$NON-NLS-0$
>+		searchParams.useRootLocation = (searchParams.useRootLocation.toLowerCase() === "true"); //$NON-NLS-0$
>+	}
> };
> 
> searchUtils.copySearchParams = function(searchParams, copyReplace) {
>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 9d6f7df..d1c0314 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/plugins/pageLinksPlugin.js
>@@ -49,7 +49,7 @@
> 		nameKey: "Search",
> 		id: "orion.Search",
> 		nls: "orion/nls/messages",
>-		uriTemplate: "{OrionHome}/search/search.html"
>+		uriTemplate: "{OrionHome}/search/search.html#{Location},useRootLocation=true"
> 	});
> 	
> 	provider.registerService("orion.page.link.related", null, {
>diff --git a/bundles/org.eclipse.orion.client.ui/web/search/search.js b/bundles/org.eclipse.orion.client.ui/web/search/search.js
>index ab8dceb..4c830c0 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/search/search.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/search/search.js
>@@ -25,7 +25,7 @@
> 	}
> 
> 	function setPageInfo(serviceRegistry, fileClient, commandService, searcher, searchResultsGenerator, searchBuilder, searchParams, progress){
>-		var searchLoc = searchParams.resource;
>+		var searchLoc = searchParams.useRootLocation ? fileClient.fileServiceRootURL(searchParams.resource) : searchParams.resource;
> 		var title = searchParams.replace ? messages["Replace All Matches"] : messages["Search Results"];
> 		if(searchLoc){
> 			if(searchLoc === fileClient.fileServiceRootURL(searchLoc)){

Actions: View

Attachments on bug 419154: 236351 | 236375