Skip to content

K
kityminder-core
Commit bd435c0a authored by techird's avatar techird
Browse files
Options

release 1.2.1

parent f555c541
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 90 deletions
dist/index.html
View file @ bd435c0a
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
<meta name="description" content="百度脑图，便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。"> <meta name="description" content="百度脑图，便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="lib/jquery-2.1.0.min.js?_=1406193886421" charset="utf-8"></script> <script src="lib/jquery-2.1.0.min.js?_=1406196567611" charset="utf-8"></script>
<script src="lib/ZeroClipboard.min.js?_=1406193886421" charset="utf-8"></script> <script src="lib/ZeroClipboard.min.js?_=1406196567611" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } ); ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } );
</script> </script>
<script src="lib/kity.min.js?_=1406193886421" charset="utf-8"></script> <script src="lib/kity.min.js?_=1406196567611" charset="utf-8"></script>
<script src="kityminder.all.min.js?_=1406193886421" charset="utf-8"></script> <script src="kityminder.all.min.js?_=1406196567611" charset="utf-8"></script>
<script src="kityminder.config.js?_=1406193886421" charset="utf-8"></script> <script src="kityminder.config.js?_=1406196567611" charset="utf-8"></script>
<script src="lang/zh-cn/zh-cn.js?_=1406193886421" charset="utf-8"></script> <script src="lang/zh-cn/zh-cn.js?_=1406196567611" charset="utf-8"></script>
<script src="lib/zip.js?_=1406193886421" charset="utf-8"></script> <script src="lib/zip.js?_=1406196567611" charset="utf-8"></script>
<script> <script>
zip.inflateJSPath = 'lib/inflate.js'; zip.inflateJSPath = 'lib/inflate.js';
</script> </script>
<script src="lib/jquery.xml2json.js?_=1406193886421" charset="utf-8"></script> <script src="lib/jquery.xml2json.js?_=1406196567611" charset="utf-8"></script>
<script src="lib/baidu-frontia-js-full-1.0.0.js?_=1406193886421" charset="utf-8"></script> <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1406196567611" charset="utf-8"></script>
<script src="social/draftmanager.js?_=1406193886421" charset="utf-8"></script> <script src="social/draftmanager.js?_=1406196567611" charset="utf-8"></script>
<script src="social/social.js?_=1406193886421" charset="utf-8"></script> <script src="social/social.js?_=1406196567611" charset="utf-8"></script>
<link href="social/social.css" rel="stylesheet"> <link href="social/social.css" rel="stylesheet">
<link href="themes/default/css/import.css" type="text/css" rel="stylesheet" /> <link href="themes/default/css/import.css" type="text/css" rel="stylesheet" />
......
dist/kityminder.all.js
View file @ bd435c0a
...@@ -2508,46 +2508,33 @@ kity.extendClass(Minder, { ...@@ -2508,46 +2508,33 @@ kity.extendClass(Minder, {
matrix.m.e = Math.round(matrix.m.e); matrix.m.e = Math.round(matrix.m.e);
matrix.m.f = Math.round(matrix.m.f); matrix.m.f = Math.round(matrix.m.f);
if (!matrix.equals(lastMatrix)) {
// 如果当前有动画，停止动画
// 如果当前有动画，停止动画 if (node._layoutTimeline) {
if (node._layoutTimeline) { node._layoutTimeline.stop();
node._layoutTimeline.stop(); node._layoutTimeline = null;
node._layoutTimeline = null; }
}
// 如果要求以动画形式来更新，创建动画
// 如果要求以动画形式来更新，创建动画 if (duration) {
if (duration) { node._layoutTimeline = new kity.Animator(lastMatrix, matrix, applyMatrix)
node._layoutTimeline = new kity.Animator(lastMatrix, matrix, applyMatrix) .start(node, duration + 300, 'ease')
.start(node, duration + 300, 'ease') .on('finish', function() {
.on('finish', function() { //可能性能低的时候会丢帧，手动添加一帧
//可能性能低的时候会丢帧，手动添加一帧 kity.Timeline.requestFrame(function() {
kity.Timeline.requestFrame(function() { applyMatrix(node, matrix);
applyMatrix(node, matrix); me.fire('layoutfinish', {
me.fire('layoutfinish', { node: node,
node: node, matrix: matrix
matrix: matrix
});
consume();
}); });
consume();
}); });
}
// 否则直接更新
else {
applyMatrix(node, matrix);
me.fire('layoutfinish', {
node: node,
matrix: matrix
}); });
consume(); }
}
} else { // 否则直接更新
// 可能位置没有改变，但是相关布局变量变了 else {
me.fire('layoutapply', { applyMatrix(node, matrix);
node: node,
matrix: matrix
});
me.fire('layoutfinish', { me.fire('layoutfinish', {
node: node, node: node,
matrix: matrix matrix: matrix
......
dist/kityminder.all.min.js
View file @ bd435c0a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/social/social.js
View file @ bd435c0a
...@@ -740,8 +740,9 @@ $(function() { ...@@ -740,8 +740,9 @@ $(function() {
// 确定上传文件名 // 确定上传文件名
if (!remotePath) { if (!remotePath) {
filename = window.prompt('请输入文件名: ', minder.getMinderTitle()); filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\"\'\*]/g, ''));
if (!filename) return; if (!filename) return;
filename = filename.replace(/[\/\\\:\?\|\<\>\"\'\*]/g, '');
uploadPath = generateRemotePath(filename); uploadPath = generateRemotePath(filename);
} else { } else {
uploadPath = remotePath; uploadPath = remotePath;
......
social/social.js
View file @ bd435c0a
...@@ -740,9 +740,9 @@ $(function() { ...@@ -740,9 +740,9 @@ $(function() {
// 确定上传文件名 // 确定上传文件名
if (!remotePath) { if (!remotePath) {
filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\*]/g, '')); filename = window.prompt('请输入文件名: ', minder.getMinderTitle().replace(/[\/\\\:\?\|\<\>\"\'\*]/g, ''));
if (!filename) return; if (!filename) return;
filename = filename.replace(/[\/\\\:\?\|\<\>\*]/g, ''); filename = filename.replace(/[\/\\\:\?\|\<\>\"\'\*]/g, '');
uploadPath = generateRemotePath(filename); uploadPath = generateRemotePath(filename);
} else { } else {
uploadPath = remotePath; uploadPath = remotePath;
......
src/core/layout.js
View file @ bd435c0a
...@@ -227,46 +227,33 @@ kity.extendClass(Minder, { ...@@ -227,46 +227,33 @@ kity.extendClass(Minder, {
matrix.m.e = Math.round(matrix.m.e); matrix.m.e = Math.round(matrix.m.e);
matrix.m.f = Math.round(matrix.m.f); matrix.m.f = Math.round(matrix.m.f);
if (!matrix.equals(lastMatrix)) {
// 如果当前有动画，停止动画
// 如果当前有动画，停止动画 if (node._layoutTimeline) {
if (node._layoutTimeline) { node._layoutTimeline.stop();
node._layoutTimeline.stop(); node._layoutTimeline = null;
node._layoutTimeline = null; }
}
// 如果要求以动画形式来更新，创建动画
// 如果要求以动画形式来更新，创建动画 if (duration) {
if (duration) { node._layoutTimeline = new kity.Animator(lastMatrix, matrix, applyMatrix)
node._layoutTimeline = new kity.Animator(lastMatrix, matrix, applyMatrix) .start(node, duration + 300, 'ease')
.start(node, duration + 300, 'ease') .on('finish', function() {
.on('finish', function() { //可能性能低的时候会丢帧，手动添加一帧
//可能性能低的时候会丢帧，手动添加一帧 kity.Timeline.requestFrame(function() {
kity.Timeline.requestFrame(function() { applyMatrix(node, matrix);
applyMatrix(node, matrix); me.fire('layoutfinish', {
me.fire('layoutfinish', { node: node,
node: node, matrix: matrix
matrix: matrix
});
consume();
}); });
consume();
}); });
}
// 否则直接更新
else {
applyMatrix(node, matrix);
me.fire('layoutfinish', {
node: node,
matrix: matrix
}); });
consume(); }
}
} else { // 否则直接更新
// 可能位置没有改变，但是相关布局变量变了 else {
me.fire('layoutapply', { applyMatrix(node, matrix);
node: node,
matrix: matrix
});
me.fire('layoutfinish', { me.fire('layoutfinish', {
node: node, node: node,
matrix: matrix matrix: matrix
......
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