Bug 514792 - AnnotationStyler to merge html and DOM node style.

eclipse · Apr 25, 2017 · 28a79e5 · 28a79e5
1 parent bddfd92
commit 28a79e5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js b/bundles/org.eclipse.orion.client.editor/web/orion/editor/annotations.js
@@ -893,7 +893,12 @@ define("orion/editor/annotations", ['i18n!orion/editor/nls/messages', 'orion/edi
 						}
 					}
 				}
-			}
+				if (style.html) {
+					result.html = style.html;
+				}
+				if (style.node) {
+					result.node = style.node;
+				}			}
 			return result;
 		},
 		_mergeStyleRanges: function(ranges, styleRange) {