Commit 0d0c229e authored by Akikonata's avatar Akikonata

grunt

parent ceb8a7e9
...@@ -7,26 +7,26 @@ ...@@ -7,26 +7,26 @@
<meta name="description" content="百度脑图,便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。"> <meta name="description" content="百度脑图,便捷的脑图编辑工具。让您在线上直接创建、保存并分享你的思路。">
<script src="lib/jquery-2.1.0.min.js?_=1399633550603" charset="utf-8"></script> <script src="lib/jquery-2.1.0.min.js?_=1399636761167" charset="utf-8"></script>
<script src="lib/ZeroClipboard.min.js?_=1399633550603" charset="utf-8"></script> <script src="lib/ZeroClipboard.min.js?_=1399636761167" 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/kitygraph.all.min.js?_=1399633550603" charset="utf-8"></script> <script src="lib/kitygraph.all.min.js?_=1399636761167" charset="utf-8"></script>
<script src="kityminder.all.min.js?_=1399633550603" charset="utf-8"></script> <script src="kityminder.all.min.js?_=1399636761167" charset="utf-8"></script>
<script src="kityminder.config.js?_=1399633550603" charset="utf-8"></script> <script src="kityminder.config.js?_=1399636761167" charset="utf-8"></script>
<script src="lang/zh-cn/zh-cn.js?_=1399633550603" charset="utf-8"></script> <script src="lang/zh-cn/zh-cn.js?_=1399636761167" charset="utf-8"></script>
<script src="lib/zip.js?_=1399633550603" charset="utf-8"></script> <script src="lib/zip.js?_=1399636761167" charset="utf-8"></script>
<script> <script>
zip.inflateJSPath = 'lib/inflate.js'; zip.inflateJSPath = 'lib/inflate.js';
</script> </script>
<script src="lib/jquery.xml2json.js?_=1399633550603" charset="utf-8"></script> <script src="lib/jquery.xml2json.js?_=1399636761167" charset="utf-8"></script>
<script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399633550603" charset="utf-8"></script> <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399636761167" charset="utf-8"></script>
<script src="social/draftmanager.js?_=1399633550603" charset="utf-8"></script> <script src="social/draftmanager.js?_=1399636761167" charset="utf-8"></script>
<script src="social/social.js?_=1399633550603" charset="utf-8"></script> <script src="social/social.js?_=1399636761167" 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" />
......
...@@ -5037,6 +5037,7 @@ KityMinder.registerModule( "TextEditModule", function () { ...@@ -5037,6 +5037,7 @@ KityMinder.registerModule( "TextEditModule", function () {
}; };
km.textEditNode = function(node){ km.textEditNode = function(node){
var textShape = node.getTextShape(); var textShape = node.getTextShape();
this.setStatus('textedit'); this.setStatus('textedit');
sel.setHide(); sel.setHide();
...@@ -5115,7 +5116,6 @@ KityMinder.registerModule( "TextEditModule", function () { ...@@ -5115,7 +5116,6 @@ KityMinder.registerModule( "TextEditModule", function () {
selectionByClick = false; selectionByClick = false;
} }
km.setStatus('textedit'); km.setStatus('textedit');
lastMousedownTimer = +new Date;
} }
} }
}, },
...@@ -5254,45 +5254,45 @@ KityMinder.registerModule( "TextEditModule", function () { ...@@ -5254,45 +5254,45 @@ KityMinder.registerModule( "TextEditModule", function () {
sel.setHide(); sel.setHide();
}, },
"execCommand": function( e ) { "execCommand": function( e ) {
// var cmds = { var cmds = {
// 'appendchildnode' : 1, 'appendchildnode' : 1,
// 'appendsiblingnode' : 1, 'appendsiblingnode' : 1,
// 'editnode' : 1 'editnode' : 1
// }; };
// if ( cmds[ e.commandName ] ){ if ( cmds[ e.commandName ] ){
//
// var node = km.getSelectedNode(); var node = km.getSelectedNode();
// if( !node ){ if( !node ){
// return; return;
// } }
//
// var textShape = node.getTextShape(); var textShape = node.getTextShape();
//
// textShape.setStyle('cursor','default'); textShape.setStyle('cursor','default');
// node.getTextShape().setStyle('cursor','text'); node.getTextShape().setStyle('cursor','text');
// km.setStatus('textedit'); km.setStatus('textedit');
// receiver.setTextEditStatus(true) receiver.setTextEditStatus(true)
// .setSelection(sel) .setSelection(sel)
// .setKityMinder(this) .setKityMinder(this)
// .setMinderNode(node) .setMinderNode(node)
// .setTextShape(textShape) .setTextShape(textShape)
// .setBaseOffset() .setBaseOffset()
// .setContainerStyle() .setContainerStyle()
// .setSelectionHeight() .setSelectionHeight()
// .getTextOffsetData() .getTextOffsetData()
// .setIndex(0) .setIndex(0)
// .updateSelection() .updateSelection()
// .setRange(range); .setRange(range);
//
// sel.setStartOffset(0); sel.setStartOffset(0);
// sel.setEndOffset(textShape.getContent().length); sel.setEndOffset(textShape.getContent().length);
// sel.setShow(); sel.setShow();
//
// receiver.updateSelectionShow(1) receiver.updateSelectionShow(1)
// .updateRange(range); .updateRange(range);
// return; return;
//
// } }
if((e.commandName == 'priority' || e.commandName == 'progress') && this.getStatus() == 'textedit' ){ if((e.commandName == 'priority' || e.commandName == 'progress') && this.getStatus() == 'textedit' ){
...@@ -5869,6 +5869,7 @@ Minder.Selection = kity.createClass( 'Selection', { ...@@ -5869,6 +5869,7 @@ Minder.Selection = kity.createClass( 'Selection', {
}else{ }else{
this.setOpacity(0.5); this.setOpacity(0.5);
} }
this.bringTop();
return this; return this;
}, },
setPosition: function ( offset ) { setPosition: function ( offset ) {
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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