Commit 832cb0c6 authored by 张博's avatar 张博

Merge branch 'dev' of https://github.com/fex-team/kityminder-core into dev

parents 5ce63474 083e9cb5
...@@ -101,13 +101,14 @@ define(function(require, exports, module) { ...@@ -101,13 +101,14 @@ define(function(require, exports, module) {
execute: function(km) { execute: function(km) {
if (_clipboardNodes.length) { if (_clipboardNodes.length) {
var node = km.getSelectedNode(); var nodes = km.getSelectedNodes();
if (!node) return; if (!nodes.length) return;
for (var i = 0, ni; for (var i = 0, ni; ni = _clipboardNodes[i]; i++) {
(ni = _clipboardNodes[i]); i++) { for (var j = 0, node; node = nodes[j]; j++) {
appendChildNode(node, ni.clone()); appendChildNode(node, ni.clone());
} }
}
km.select(_selectedNodes, true); km.select(_selectedNodes, true);
_selectedNodes = []; _selectedNodes = [];
......
...@@ -109,7 +109,19 @@ define(function(require, exports, module) { ...@@ -109,7 +109,19 @@ define(function(require, exports, module) {
'default': -0.16 'default': -0.16
}, },
'Lux': { '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
} }
}, },
}; };
......
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