Attachment 263936 Details for Bug 500696 – Proposed patch

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

[patch] Proposed patch

500696.patch (text/plain), 1013 bytes, created by Olivier Thomann

on 2016-09-02 10:37:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2016-09-02 10:37:06 EDT

Size: 1013 bytes

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>index c06da77..3d0a3d4 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/javascriptProject.js
>@@ -272,7 +272,13 @@ define([
> 	function _merge(source, dest) {
> 		Object.keys(source).forEach(function(key) {
> 			if(Array.isArray(dest[key]) && Array.isArray(source[key])) {
>-				dest[key] = [].concat(dest[key], source[key]);
>+				var result = dest[key];
>+				source[key].forEach(function(element) {
>+					if (!result.some(function(resultElement) { return element === resultElement;})) {
>+						result.push(element);
>+					}
>+				});
>+				dest[key] = result;
> 			} else if(typeof dest[key] === 'object' && dest[key] !== null) {
> 				source[key] = source[key] || Object.create(null);
> 				_merge(source[key], dest[key]);

Actions: View | Diff

Attachments on bug 500696: 263936