using attributed string

tomsontom · Oct 16, 2012 · 2fe7a13 · 2fe7a13
1 parent 658d380
commit 2fe7a13
Showing 1 changed file with 41 additions and 1 deletion.
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
@@ -416,6 +416,46 @@ define("orion/editor/contentAssist", ['i18n!orion/editor/nls/messages', 'orion/t
 			if (proposal.style === "hr") {
 				node = document.createElement("hr");
 				div.appendChild(node, div);
+			} else if( proposal.style === "attributedString" ) {
+				div.className = this.calculateClasses(proposal.style, isSelected);
+				if (isSelected) {
+					this.parentNode.setAttribute("aria-activedescendant", div.id);
+				}
+
+				var contentDiv = document.createElement("div");
+				var nobr = document.createElement("nobr");
+				contentDiv.appendChild(nobr);
+				var contentNode = nobr;
+				if( proposal.description ) {
+					if( proposal.description.styleClass ) {
+						contentDiv.className = proposal.description.styleClass;
+					}
+
+					if( proposal.description.segments ) {
+						proposal.description.segments.forEach( function(segment) {
+							var itemNode = document.createElement("span");
+							var styleString = "";
+
+							if( segment.style ) {
+								if( segment.style.bold ) {
+									itemNode.style.fontWeight = "bold";
+								} else if(segment.style.italic) {
+									itemNode.style.fontStyle = "italic";
+								} else if(segment.style.color != null) {
+									itemNode.style.color = segment.style.color;
+								} else if(segment.style.fontname != null) {
+									itemNode.style.fontName = segment.style.fontname;
+								}
+							}
+							itemNode.appendChild(document.createTextNode(segment.value));
+
+							contentNode.appendChild(itemNode);
+						} );
+
+					}
+				}
+
+				div.appendChild(contentDiv);
 			} else if( proposal.style === "html" ) {
 				div.className = this.calculateClasses(proposal.style, isSelected);
 				if (isSelected) {
@@ -429,7 +469,7 @@ define("orion/editor/contentAssist", ['i18n!orion/editor/nls/messages', 'orion/t
 				if (isSelected) {
 					this.parentNode.setAttribute("aria-activedescendant", div.id);
 				}
-				div.appendChild(node, div);
+				div.appendChild(node);
 			}
 
 			parent.appendChild(div);