Merge remote-tracking branch 'origin/dev' into dev

3a899c6e · campaign · 99d87e94 · d6e681af · 3a899c6e
Commit 3a899c6e authored May 09, 2014 by campaign
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

layout.default.js src/module/layout.default.js +2 -2

No files found.
--- a/src/module/layout.default.js
+++ b/src/module/layout.default.js
@@ -465,10 +465,10 @@ KityMinder.registerModule( "LayoutDefault", function () {
 			case "sub":
 				if ( highlight ) {
 					Layout.highlightshape.fill( nodeStyle.highlight ).setOpacity( 1 );
-					node.getTextShape().fill( 'black' );
+					node.getTextShape().fill( node.getData( 'fontcolor' ) || 'black' );
 				} else {
 					Layout.highlightshape.setOpacity( 0 );
-					node.getTextShape().fill( 'white' );
+					node.getTextShape().fill( node.getData( 'fontcolor' ) || 'white' );
 				}
 				break;
 			default: