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
832cb0c6
Commit
832cb0c6
authored
Oct 20, 2015
by
张博
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://github.com/fex-team/kityminder-core
into dev
parents
5ce63474
083e9cb5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
clipboard.js
src/module/clipboard.js
+6
-5
text.js
src/module/text.js
+13
-1
No files found.
src/module/clipboard.js
View file @
832cb0c6
...
...
@@ -101,13 +101,14 @@ define(function(require, exports, module) {
execute
:
function
(
km
)
{
if
(
_clipboardNodes
.
length
)
{
var
node
=
km
.
getSelectedNode
();
if
(
!
node
)
return
;
var
node
s
=
km
.
getSelectedNodes
();
if
(
!
node
s
.
length
)
return
;
for
(
var
i
=
0
,
ni
;
(
ni
=
_clipboardNodes
[
i
]);
i
++
)
{
for
(
var
i
=
0
,
ni
;
ni
=
_clipboardNodes
[
i
];
i
++
)
{
for
(
var
j
=
0
,
node
;
node
=
nodes
[
j
];
j
++
)
{
appendChildNode
(
node
,
ni
.
clone
());
}
}
km
.
select
(
_selectedNodes
,
true
);
_selectedNodes
=
[];
...
...
src/module/text.js
View file @
832cb0c6
...
...
@@ -109,7 +109,19 @@ define(function(require, exports, module) {
'default'
:
-
0.16
},
'Lux'
:
{
'宋体,SimSun'
:
-
0.02
"宋体,SimSun"
:
-
0.2
,
"微软雅黑,Microsoft YaHei"
:
-
0.2
,
"黑体, SimHei"
:
-
0.2
,
"隶书, SimLi"
:
-
0.2
,
"楷体,楷体_GB2312,SimKai"
:
-
0.2
,
"andale mono"
:
-
0.2
,
"arial,helvetica,sans-serif"
:
-
0.2
,
"comic sans ms"
:
-
0.2
,
"impact,chicago"
:
-
0.2
,
"times new roman"
:
-
0.2
,
"sans-serif"
:
-
0.2
,
"arial black,avant garde"
:
-
0.2
,
"default"
:
-
0.16
}
},
};
...
...
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