Attachment 259892 Details for Bug 488337 – Fix

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

[patch] Fix

changes (6).patch (text/plain), 2.11 KB, created by Curtis Windatt

on 2016-02-23 16:42:11 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Curtis Windatt

Created: 2016-02-23 16:42:11 EST

Size: 2.11 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.javascript/web/javascript/scriptResolver.js b/bundles/org.eclipse.orion.client.javascript/web/javascript/scriptResolver.js
>index dfc0173..eab85b9 100644
>--- a/bundles/org.eclipse.orion.client.javascript/web/javascript/scriptResolver.js
>+++ b/bundles/org.eclipse.orion.client.javascript/web/javascript/scriptResolver.js
>@@ -213,32 +213,30 @@
>        		if(typeof(path2) === 'undefined') {
>        			return typeof(file) === 'undefined';
>        		}
>-       		if(file.contentType && meta.contentType && file.contentType.name === meta.contentType.name) {
>-       			//get rid of extensions and compare the names
>-       			var loc = file.location ? file.location : file.Location;
>-       			if(!loc) {
>-       				return false;
>-       			}
>-       			var idx = loc.lastIndexOf('.');
>-       			var p1 = loc;
>-       			if(idx > -1) {
>-	      			p1 = loc.slice(0, idx);
>-	      		}
>-	      		if(path2 === p1) {
>-	      			return true; //could be that only the extension was missing from the other path
>-	      		}
>-	      		idx = path2.lastIndexOf('.');
>-       			var p2 = path2;
>-       			if(idx > -1) {
>-	      			p2 = path2.slice(0, idx);
>-	      		}
>-	      		if(p1 === p2) {
>-	      			return true;
>-	      		} else if(p1 === decodeURIComponent(p2)) {
>-	      			return true;
>-	      		}
>-	      		return false;
>-       		}
>+   			//get rid of extensions and compare the names
>+   			var loc = file.location ? file.location : file.Location;
>+   			if(!loc) {
>+   				return false;
>+   			}
>+   			var idx = loc.lastIndexOf('.');
>+   			var p1 = loc;
>+   			if(idx > -1) {
>+      			p1 = loc.slice(0, idx);
>+      		}
>+      		if(path2 === p1) {
>+      			return true; //could be that only the extension was missing from the other path
>+      		}
>+      		idx = path2.lastIndexOf('.');
>+   			var p2 = path2;
>+   			if(idx > -1) {
>+      			p2 = path2.slice(0, idx);
>+      		}
>+      		if(p1 === p2) {
>+      			return true;
>+      		} else if(p1 === decodeURIComponent(p2)) {
>+      			return true;
>+      		}
>+      		return false;
>        },
> 
>        /**

Actions: View | Diff

Attachments on bug 488337: 259892