Commit 431c38dd authored by Akikonata's avatar Akikonata

grunt

parent 9a9888fb
...@@ -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?_=1399630445671" charset="utf-8"></script> <script src="lib/jquery-2.1.0.min.js?_=1399630488043" charset="utf-8"></script>
<script src="lib/ZeroClipboard.min.js?_=1399630445671" charset="utf-8"></script> <script src="lib/ZeroClipboard.min.js?_=1399630488043" 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?_=1399630445671" charset="utf-8"></script> <script src="lib/kitygraph.all.min.js?_=1399630488043" charset="utf-8"></script>
<script src="kityminder.all.min.js?_=1399630445671" charset="utf-8"></script> <script src="kityminder.all.min.js?_=1399630488043" charset="utf-8"></script>
<script src="kityminder.config.js?_=1399630445671" charset="utf-8"></script> <script src="kityminder.config.js?_=1399630488043" charset="utf-8"></script>
<script src="lang/zh-cn/zh-cn.js?_=1399630445671" charset="utf-8"></script> <script src="lang/zh-cn/zh-cn.js?_=1399630488043" charset="utf-8"></script>
<script src="lib/zip.js?_=1399630445671" charset="utf-8"></script> <script src="lib/zip.js?_=1399630488043" charset="utf-8"></script>
<script> <script>
zip.inflateJSPath = 'lib/inflate.js'; zip.inflateJSPath = 'lib/inflate.js';
</script> </script>
<script src="lib/jquery.xml2json.js?_=1399630445671" charset="utf-8"></script> <script src="lib/jquery.xml2json.js?_=1399630488043" charset="utf-8"></script>
<script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399630445671" charset="utf-8"></script> <script src="lib/baidu-frontia-js-full-1.0.0.js?_=1399630488043" charset="utf-8"></script>
<script src="social/draftmanager.js?_=1399630445671" charset="utf-8"></script> <script src="social/draftmanager.js?_=1399630488043" charset="utf-8"></script>
<script src="social/social.js?_=1399630445671" charset="utf-8"></script> <script src="social/social.js?_=1399630488043" 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" />
......
...@@ -5328,6 +5328,9 @@ Minder.Range = kity.createClass('Range',{ ...@@ -5328,6 +5328,9 @@ Minder.Range = kity.createClass('Range',{
this.nativeRange = document.createRange(); this.nativeRange = document.createRange();
this.nativeSel = window.getSelection(); this.nativeSel = window.getSelection();
}, },
hasNativeRange : function(){
return this.nativeSel.rangeCount != 0 ;
},
select:function(){ select:function(){
var start = this.nativeRange.startContainer; var start = this.nativeRange.startContainer;
if(start.nodeType == 1 && start.childNodes.length == 0){ if(start.nodeType == 1 && start.childNodes.length == 0){
...@@ -5466,6 +5469,9 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -5466,6 +5469,9 @@ Minder.Receiver = kity.createClass( 'Receiver', {
var keys = KityMinder.keymap; var keys = KityMinder.keymap;
function setTextToContainer() { function setTextToContainer() {
if(!me.range.hasNativeRange()){
return;
}
var text = me.container.textContent.replace( /[\u200b\t\r\n]/g, '' ); var text = me.container.textContent.replace( /[\u200b\t\r\n]/g, '' );
if ( me.textShape.getOpacity() == 0 ) { if ( me.textShape.getOpacity() == 0 ) {
...@@ -5559,7 +5565,6 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -5559,7 +5565,6 @@ Minder.Receiver = kity.createClass( 'Receiver', {
break; break;
case 'beforekeyup': case 'beforekeyup':
switch ( keyCode ) { switch ( keyCode ) {
case keymap.Enter: case keymap.Enter:
case keymap.Tab: case keymap.Tab:
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Subproject commit 256dce28fb1e574b18f0dd084f7503cbc25e2a80 Subproject commit d4e00b314db4116a92583114bcb67ff9a3c4d48d
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