tweaks

michmech · Mar 21, 2018 · 743000b · 743000b
1 parent e66d707
commit 743000b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/xonomy.css b/xonomy.css
@@ -164,6 +164,7 @@
 .xonomy.nerd .attribute.invalid > .warner { display: inline-block; }
 
 /*Caption beside attribute values and elements*/
+.xonomy.nerd .inlinecaption:empty {display: none;}
 .xonomy.nerd .inlinecaption { font-family: Verdana, sans-serif; font-size: 0.8em; color: #999999; font-weight: normal;
 	-webkit-user-select: text; -moz-user-select: text; -ms-user-select: text; user-select: text; cursor: text !important;
 }
@@ -266,6 +267,7 @@
 .xonomy.laic .element.collapsed > .childrenCollapsed:hover { background-color: #f4f4f4; }
 
 /*Caption beside attribute values and elements*/
+.xonomy.laic .inlinecaption:empty {display: none;}
 .xonomy.laic .inlinecaption {-webkit-user-select: text; -moz-user-select: text; -ms-user-select: text; user-select: text; cursor: text !important;}
 .xonomy.laic .attribute > .inlinecaption { font-family: Verdana, sans-serif; font-size: 0.75rem; color: #999999; font-weight: normal; margin-left: 5px; margin-right: 4px; }
 .xonomy.laic .element > .inlinecaption { font-family: Verdana, sans-serif; font-size: 0.75rem; color: #999999; font-weight: normal; display: block; position: absolute; top: 10px; right: 3px; z-index: 9; }

diff --git a/xonomy.js b/xonomy.js
@@ -255,6 +255,7 @@ Xonomy.verifyDocSpecElement=function(name) { //make sure the DocSpec object has
 	spec.localDropOnly=Xonomy.asFunction(spec.localDropOnly, false);
 	spec.isReadOnly=Xonomy.asFunction(spec.isReadOnly, false);
 	spec.isInvisible=Xonomy.asFunction(spec.isInvisible, false);
+	spec.backgroundColour=Xonomy.asFunction(spec.backgroundColour, "");
 	if(spec.displayName) spec.displayName=Xonomy.asFunction(spec.displayName, "");
 	if(spec.title) spec.title=Xonomy.asFunction(spec.title, "");
 	for(var i=0; i<spec.menu.length; i++) Xonomy.verifyDocSpecMenuItem(spec.menu[i]);
@@ -557,7 +558,7 @@ Xonomy.renderElement=function(element) {
 			html+='<span class="plusminus" onclick="Xonomy.plusminus(\''+htmlID+'\')"></span>';
 			html+='<span class="draghandle" draggable="true" ondragstart="Xonomy.drag(event)"></span>';
 		html+='</span>';
-		html+='<span class="tag opening focusable" style="background-color: '+spec.backgroundColour+';">';
+		html+='<span class="tag opening focusable" style="background-color: '+spec.backgroundColour(element)+';">';
 			html+='<span class="punc">&lt;</span>';
 			html+='<span class="warner"><span class="inside" onclick="Xonomy.click(\''+htmlID+'\', \'warner\')"></span></span>';
 			html+='<span class="name" title="'+title+'" onclick="Xonomy.click(\''+htmlID+'\', \'openingTagName\')">'+displayName+'</span>';
@@ -595,7 +596,7 @@ Xonomy.renderElement=function(element) {
 				}
 			}
 		html+='</div>';
-		html+='<span class="tag closing focusable" style="background-color: '+spec.backgroundColour+';">';
+		html+='<span class="tag closing focusable" style="background-color: '+spec.backgroundColour(element)+';">';
 			html+='<span class="punc">&lt;</span>';
 			html+='<span class="punc">/</span>';
 			html+='<span class="name" onclick="Xonomy.click(\''+htmlID+'\', \'closingTagName\')">'+displayName+'</span>';