Attachment 223894 Details for Bug 392070 – Extra changes on top of original commit

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

[patch] Extra changes on top of original commit

diffed (text/plain), 2.68 KB, created by Andrew Eisenberg

on 2012-11-22 16:58:11 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Eisenberg

Created: 2012-11-22 16:58:11 EST

Size: 2.68 KB

patch

obsolete

>diff --git a/bundles/org.eclipse.orion.client.core/web/css/ide.css b/bundles/org.eclipse.orion.client.core/web/css/ide.css
>index c8c84d0..f9296f6 100644
>--- a/bundles/org.eclipse.orion.client.core/web/css/ide.css
>+++ b/bundles/org.eclipse.orion.client.core/web/css/ide.css
>@@ -656,6 +656,10 @@ h2 {
> 	width: 350px;
> }
> 
>+.contentassist .proposal {
>+	white-space: nowrap;
>+}
>+
> .contentassist:focus {
> 	border: 1px solid #666;
> }
>diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>index f483b02..4a205ff 100644
>--- a/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>+++ b/bundles/org.eclipse.orion.client.editor/web/orion/editor/contentAssist.js
>@@ -424,24 +424,18 @@ define("orion/editor/contentAssist", ['i18n!orion/editor/nls/messages', 'orion/t
> 				}
> 				
> 				var contentDiv = util.createElement(document, "div");
>-				var nobr = util.createElement(document, "nobr");
>-				contentDiv.appendChild(nobr);
>-				var contentNode = nobr;
>+				contentDiv.className = "proposal";
> 				if( proposal.description ) {
>-					if( proposal.description.styleClass ) {
>-						contentDiv.className = proposal.description.styleClass;
>-					}
> 					
> 					if( proposal.description.icon ) {
> 						var iconNode = util.createElement(document, "img");
> 						iconNode.src = proposal.description.icon.src;
>-						contentNode.appendChild(iconNode);
>+						contentDiv.appendChild(iconNode);
> 					}
> 					
> 					if( proposal.description.segments ) {
> 					    proposal.description.segments.forEach( function(segment) {
> 							var itemNode = util.createElement(document, "span");
>-							var styleString = "";
> 							
> 							if( segment.style ) {
> 								if( segment.style.bold ) {
>@@ -452,21 +446,21 @@ define("orion/editor/contentAssist", ['i18n!orion/editor/nls/messages', 'orion/t
> 									itemNode.style.fontStyle = "italic";
> 								}
> 								
>-								if(segment.style.color != null) {
>+								if(segment.style.color) {
> 									itemNode.style.color = segment.style.color;
> 								}
> 								
>-								if(segment.style.fontName != null) {
>-									itemNode.style.fontName = segment.style.fontName;
>+								if(segment.style.fontFamily) {
>+									itemNode.style.fontFamily = segment.style.fontFamily;
> 								}
> 								
>-								if(segment.style.backgroundColor != null) {
>+								if(segment.style.backgroundColor) {
> 									itemNode.style.backgroundColor = segment.style.backgroundColor;
> 								}
> 							}
> 							itemNode.appendChild(document.createTextNode(segment.value));
> 							
>-							contentNode.appendChild(itemNode);
>+							contentDiv.appendChild(itemNode);
> 						} );
> 						
> 					}

Actions: View | Diff

Attachments on bug 392070: 222405 | 223894