Commit 9980f44d authored by techird's avatar techird

Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

Conflicts:
	demo/dev.html
parents d90f302b 60da728d
...@@ -22,6 +22,6 @@ ...@@ -22,6 +22,6 @@
</div> </div>
</body> </body>
<script> <script>
window.m = KM.getKityMinder('kityminder'); window.km = KM.getKityMinder('kityminder');
</script> </script>
</html> </html>
\ No newline at end of file
...@@ -227,7 +227,7 @@ var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", { ...@@ -227,7 +227,7 @@ var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", {
}, },
clone: function () { clone: function () {
function cloneNode( parent, isClonedNode ) { function cloneNode( parent, isClonedNode ) {
var _tmp = new KM.MinderNode(); var _tmp = new KM.MinderNode(isClonedNode.getText());
_tmp.data = Utils.clonePlainObject( isClonedNode.getData() ); _tmp.data = Utils.clonePlainObject( isClonedNode.getData() );
_tmp.parent = parent; _tmp.parent = parent;
......
...@@ -64,9 +64,11 @@ KityMinder.registerModule( "fontmodule", function () { ...@@ -64,9 +64,11 @@ KityMinder.registerModule( "fontmodule", function () {
e.node.getTextShape().setAttr( 'font-family', val ); e.node.getTextShape().setAttr( 'font-family', val );
} }
if ( val = e.node.getData( 'fontcolor' ) ) { if ( val = e.node.getData( 'fontcolor' ) ) {
console.log( val );
e.node.getTextShape().fill( val ); e.node.getTextShape().fill( val );
} }
if ( val = e.node.getData( 'fontsize' ) ) {
e.node.getTextShape().setSize(val);
}
} }
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment