Commit a2a4239d authored by techird's avatar techird

bug fix

parent 936b0211
......@@ -7,26 +7,26 @@
<meta name="description" content="百度脑图,便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<script src="lib/jquery-2.1.0.min.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/ZeroClipboard.min.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/jquery-2.1.0.min.js?_=1404922397905" charset="utf-8"></script>
<script src="lib/ZeroClipboard.min.js?_=1404922397905" charset="utf-8"></script>
<script type="text/javascript">
ZeroClipboard.setDefaults( { moviePath: 'lib/ZeroClipboard.swf' } );
</script>
<script src="lib/kity.min.js?_=1404914306873" charset="utf-8"></script>
<script src="kityminder.all.min.js?_=1404914306873" charset="utf-8"></script>
<script src="kityminder.config.js?_=1404914306873" charset="utf-8"></script>
<script src="lang/zh-cn/zh-cn.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/kity.min.js?_=1404922397905" charset="utf-8"></script>
<script src="kityminder.all.min.js?_=1404922397905" charset="utf-8"></script>
<script src="kityminder.config.js?_=1404922397905" charset="utf-8"></script>
<script src="lang/zh-cn/zh-cn.js?_=1404922397905" charset="utf-8"></script>
<script src="lib/zip.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/zip.js?_=1404922397905" charset="utf-8"></script>
<script>
zip.inflateJSPath = 'lib/inflate.js';
</script>
<script src="lib/jquery.xml2json.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/baidu-frontia-js-full-1.0.0.js?_=1404914306873" charset="utf-8"></script>
<script src="social/draftmanager.js?_=1404914306873" charset="utf-8"></script>
<script src="social/social.js?_=1404914306873" charset="utf-8"></script>
<script src="lib/jquery.xml2json.js?_=1404922397905" charset="utf-8"></script>
<script src="lib/baidu-frontia-js-full-1.0.0.js?_=1404922397905" charset="utf-8"></script>
<script src="social/draftmanager.js?_=1404922397905" charset="utf-8"></script>
<script src="social/social.js?_=1404922397905" charset="utf-8"></script>
<link href="social/social.css" rel="stylesheet">
<link href="themes/default/css/import.css" type="text/css" rel="stylesheet" />
......
/*!
* ====================================================
* kityminder - v1.1.3 - 2014-07-09
* kityminder - v1.1.3 - 2014-07-10
* https://github.com/fex-team/kityminder
* GitHub: https://github.com/fex-team/kityminder.git
* Copyright (c) 2014 f-cube @ FEX; Licensed MIT
......@@ -4437,8 +4437,9 @@ KityMinder.registerModule("HistoryModule", function() {
if (compareNode(srcNode, tagNode) === false) {
srcNode.setValue(tagNode);
srcNode.render();
}
//todo,这里有性能问题,变成全部render了
srcNode.render();
if (srcNode.isSelected()) {
selectedNodes.push(srcNode);
}
......@@ -4850,6 +4851,7 @@ KityMinder.registerModule('image', function() {
n.setData('imageSize', size);
n.render();
});
km.fire("saveScene");
km.layout(300);
});
......@@ -6215,6 +6217,9 @@ KityMinder.registerModule('Select', function() {
// 应用选中范围
minder.select(selectedNodes, true);
// 清除多余的东西
window.getSelection().removeAllRanges()
},
selectEnd: function(e) {
if (startPosition) {
......@@ -6232,6 +6237,11 @@ KityMinder.registerModule('Select', function() {
var lastDownNode = null, lastDownPosition = null;
return {
'init': function() {
window.addEventListener('mouseup', function() {
marqueeActivator.selectEnd();
});
},
'events': {
'normal.mousedown textedit.mousedown inputready.mousedown': function(e) {
......@@ -6426,7 +6436,8 @@ KityMinder.registerModule('TextEditModule', function() {
}
//模拟光标没有准备好
receiver.clearReady();
//当点击空白处时,光标需要消失
receiver.clear();
},
'inputready.keyup':function(e){
......@@ -6565,12 +6576,8 @@ KityMinder.registerModule('TextEditModule', function() {
}
// receiver.clear();
// if (this.getStatus() == 'textedit') {
// this.setStatus('normal');
// }
if(sel.isShow()){
receiver.updateTextOffsetData().updateSelection()
receiver.updateTextOffsetData().updateSelection();
}
},
'layoutfinish':function(e){
......@@ -6839,7 +6846,8 @@ Minder.Receiver = kity.createClass('Receiver', {
me.updateIndex();
me.updateSelection();
me.timer = setTimeout(function() {
me.selection.setShow();
if(me.selection.isShow())
me.selection.setShow();
}, 200);
me.km.setStatus('textedit');
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -95,8 +95,6 @@ KityMinder.registerModule('Select', function() {
});
marqueeMode = false;
}
// 清除多余的东西
window.getSelection().removeAllRanges()
}
};
})();
......
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