Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kityminder-core
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
吴志俊
kityminder-core
Commits
9980f44d
Commit
9980f44d
authored
Feb 12, 2014
by
techird
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://github.com/kitygraph/kityminder
into dev
Conflicts: demo/dev.html
parents
d90f302b
60da728d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
dev.html
demo/dev.html
+1
-1
node.js
src/core/node.js
+1
-1
font.js
src/module/font.js
+3
-1
No files found.
demo/dev.html
View file @
9980f44d
...
@@ -22,6 +22,6 @@
...
@@ -22,6 +22,6 @@
</div>
</div>
</body>
</body>
<script>
<script>
window
.
m
=
KM
.
getKityMinder
(
'kityminder'
);
window
.
k
m
=
KM
.
getKityMinder
(
'kityminder'
);
</script>
</script>
</html>
</html>
\ No newline at end of file
src/core/node.js
View file @
9980f44d
...
@@ -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
;
...
...
src/module/font.js
View file @
9980f44d
...
@@ -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
);
}
}
}
}
}
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment