Attachment 236498 Details for Bug 419178 – Fix patch

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

Fix patch

patch419178.txt (text/plain), 2.56 KB, created by libing wang

on 2013-10-15 13:58:28 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: libing wang

Created: 2013-10-15 13:58:28 EDT

Size: 2.56 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/PageLinks.js b/bundles/org.eclipse.orion.client.ui/web/orion/PageLinks.js
>index 0cc0b74..48acc14 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/PageLinks.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/PageLinks.js
>@@ -75,13 +75,23 @@
> 		return Deferred.all(infos);
> 	}
> 
>-	function createLink(href, target, textContent) {
>+	function createLink(href, target, textContent, id) {
> 		var a = document.createElement("a");
>+		if(id) {
>+			a.id = "_PageLink_" + id; //$NON-NLS-0$
>+		}
> 		a.href = href;
> 		a.target = target;
> 		a.classList.add("targetSelector");
> 		a.textContent = textContent;
> 		return a;
>+	}
>+
>+	function updateLink(href, id) {
>+		var a = document.getElementById("_PageLink_" + id);//$NON-NLS-0$
>+		if(a) {
>+			a.href = href;
>+		}
> 	}
> 
> 	/**
>@@ -102,7 +112,22 @@
> 				return 0;
> 			}); 
> 			return links.map(function(info) {
>-				return createLink(info.href, "_self", info.textContent); //$NON-NLS-0$
>+				return createLink(info.href, "_self", info.textContent, info.id); //$NON-NLS-0$
>+			});
>+		});
>+	}
>+
>+	/**
>+	 * Update links from an <code>orion.page.link</code> service extension.
>+	 * @memberOf orion.PageLinks
>+	 * @function
>+	 * @param {orion.ServiceRegistry} serviceRegistry The service registry.
>+	 * @param {String} serviceName Service name to read extensions from.
>+	 */
>+	function updatePageLinks(serviceRegistry, serviceName) {
>+		getPageLinksInfo(serviceRegistry, serviceName).then(function(links) {
>+			links.forEach(function(info) {
>+				updateLink(info.href, info.id); //$NON-NLS-0$
> 			});
> 		});
> 	}
>@@ -114,6 +139,7 @@
> 	 */
> 	return {
> 		createPageLinks: createPageLinks,
>+		updatePageLinks: updatePageLinks,
> 		getPageLinksInfo: getPageLinksInfo,
> 		getOrionHome: getOrionHome
> 	};
>diff --git a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>index 05c4199..3f2f32c 100644
>--- a/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>+++ b/bundles/org.eclipse.orion.client.ui/web/orion/globalCommands.js
>@@ -405,6 +405,8 @@
> 		var fileSystemRootName;
> 		var breadcrumbRootName = options.breadcrumbRootName;
> 		var serviceRegistry = options.serviceRegistry;
>+		//If a page link needs location, it has to be updated when target changes.
>+		PageLinks.updatePageLinks(serviceRegistry, "orion.page.link");
> 		if (options.target) { // we have metadata
> 			if (options.searchService) {
> 				options.searchService.setLocationByMetaData(options.target);

Actions: View

Attachments on bug 419178: 236498