merge from dev

CHANGELOG.md

+# KityMinder Change List
+
+----------
+
+## v1.1.0
+
+### 功能更新
+
+1. 添加了粘贴剪贴复制功能
+2. 添加了本地自动保存草稿的功能
+3. 发布版本上添加了 Github 地址
+
+### 功能调整
+
+1. 视野定位功能抽取为 camera 命令，并且创建新文件和打开文件会把视野定位到根节点
+
+### 问题修复
+
+1. 修正了 bottom 主题的位置问题
+2. 修正了子节点全部删除后展开/收缩标志依然存在画布上的问题
+3. 修复了 bottom 主题的键盘导航出错的问题
+4. 滚轮缩放的问题
+
+
+----------
+
+
+## v1.0.1
+
+### 问题修复
+
+1. 修复 png 导出问题。
+
+
+----------
+
+
+## v1.0.0
+
+首个版本发布，包括基本的编辑功能。

social/social.js

@@ -130,11 +130,14 @@ $( function () {
             by: 'time',
             success: function ( result ) {
                 if ( result.list.length ) {
-                    if ( !isShareLink && !thisMapFilename ) {
+                    if ( !isShareLink && !thisMapFilename && !draft.data ) {
                         loadPersonal( result.list[ 0 ].path );
                     } else {
                         $user_btn.loading( false );
                     }
+                    if ( draft.data ) {
+                        setFileSaved( false );
+                    }
                     addToRecentMenu( result.list );
                 }
             }
@@ -166,27 +169,24 @@ $( function () {
 
     function loadPersonal( path ) {
         var sto = baidu.frontia.personalStorage;
-        thisMapFilename = path;
-        if ( thisMapFilename == draft.filename ) {
-            $user_btn.loading( false ).text( getFileName( path ) );
-            setFileSaved( false );
-        } else {
-            $user_btn.loading( '加载“' + getFileName( path ) + '”...' );
-            sto.getFileUrl( path, {
-                success: function ( url ) {
-                    $.ajax( {
-                        cache: false,
-                        url: url,
-                        dataType: 'text',
-                        success: function ( result ) {
-                            window.km.importData( result, 'json' );
-                            $user_btn.loading( false ).text( getFileName( path ) );
-                            isFileSaved = true;
-                        }
-                    } );
-                }
-            } );
-        }
+        $user_btn.loading( '加载“' + getFileName( path ) + '”...' );
+        sto.getFileUrl( path, {
+            success: function ( url ) {
+                $.ajax( {
+                    cache: false,
+                    url: url,
+                    dataType: 'text',
+                    success: function ( result ) {
+                        thisMapFilename = path;
+                        window.km.importData( result, 'json' );
+                        window.km.execCommand( 'camera', window.km.getRoot() );
+                        $user_btn.loading( false );
+                        setFileSaved( true );
+                        clearDraft();
+                    }
+                } );
+            }
+        } );
     }
 
     function getMapFileName() {
@@ -204,14 +204,17 @@ $( function () {
         var data = window.km.exportData( 'json' );
         save( data, thisMapFilename || getMapFileName(), function ( success, info ) {
             if ( success ) {
+                thisMapFilename = info.path;
                 $save_btn.text( '已保存！' );
                 if ( !thisMapFilename ) {
-                    thisMapFilename = info.path;
                     addToRecentMenu( [ info ] );
                     $user_btn.text( getFileName( thisMapFilename ) );
+                    checkAutoSave();
                 }
+                setFileSaved( true );
+            } else {
+                $save_btn.loading( false ).text( '保存失败！' );
             }
-            console.log( info );
         } );
         $save_btn.loading( '正在保存...' );
     }
@@ -221,14 +224,14 @@ $( function () {
         var options = {
             ondup: thisMapFilename ? sto.constant.ONDUP_OVERWRITE : sto.constant.ONDUP_NEWCOPY,
             success: function ( result ) {
-                setFileSaved( true );
-                callback( true, result );
+                callback( !!result.path, result );
             },
             error: function ( error ) {
                 callback( false, error );
             }
         };
         sto.uploadTextFile( file, filename, options );
+        clearDraft();
     }
 
     function uuid() {
@@ -320,16 +323,18 @@ $( function () {
         var pattern = /path=(.+?)([&#]|$)/;
         var match = pattern.exec( window.location ) || pattern.exec( document.referrer );
         if ( !match ) return;
-        thisMapFilename = decodeURIComponent( match[ 1 ] );
+        var path = decodeURIComponent( match[ 1 ] );
+        loadPersonal( path );
     }
 
     function setFileSaved( saved ) {
-        $save_btn.disabled( saved || !currentUser );
+        $save_btn.disabled( !currentUser || saved );
         if ( saved ) {
             $user_btn.text( getFileName( thisMapFilename ) );
+            clearDraft();
         } else {
             $save_btn.text( '保存' );
-            $user_btn.text( getFileName( thisMapFilename || getMapFileName() ) + ' *' );
+            $user_btn.text( getFileName( thisMapFilename || draft.filename || getMapFileName() ) + ' *' );
         }
     }
 
@@ -337,7 +342,7 @@ $( function () {
         var sto = window.localStorage;
         if ( !sto ) return;
         draft = {
-            filename: thisMapFilename,
+            filename: thisMapFilename || getMapFileName(),
             data: window.km.exportData( 'json' )
         };
         sto.setItem( 'draft_filename', draft.filename );
@@ -351,29 +356,34 @@ $( function () {
         if ( !sto ) return;
 
         draft.data = sto.getItem( 'draft_data' );
-        draft.filename = sto.getItem( 'draft_filename' );
+        thisMapFilename = draft.filename = sto.getItem( 'draft_filename' );
+
         if ( draft.data ) {
             window.km.importData( draft.data, 'json' );
             setFileSaved( false );
         }
     }
 
-    loadAutoSave();
+    function clearDraft() {
+        var sto = window.localStorage;
+        if ( !sto ) return;
+
+        sto.removeItem( 'draft_data' );
+        sto.removeItem( 'draft_filename' );
+    }
+
 
     loadShare();
 
+    if ( !isShareLink ) {
+        loadAutoSave();
+    }
+
     currentUser = baidu.frontia.getCurrentAccount();
     if ( currentUser ) {
         setCurrentUser( currentUser );
         loadPath();
-        if ( thisMapFilename ) {
-            loadPersonal( thisMapFilename );
-        }
-    } else {
-        loadAutoSave();
     }
 
-    window.km.on( 'contentchange', function () {
-        checkAutoSave();
-    } );
+    window.km.on( 'contentchange', checkAutoSave );
 } );
\ No newline at end of file

src/core/keymap.js

@@ -35,7 +35,10 @@ var keymap = KityMinder.keymap  = {
 
     "b":66,
     'i':73,
-
+    //回退
     'z':90,
-    'y':89
+    'y':89,
+    //粘贴
+    'v' : 86,
+    'x' : 88
 };
\ No newline at end of file

src/core/minder.event.js

@@ -21,7 +21,7 @@ kity.extendClass( Minder, {
     _bindKeyboardEvents: function () {
         if ( ( navigator.userAgent.indexOf( 'iPhone' ) == -1 ) && ( navigator.userAgent.indexOf( 'iPod' ) == -1 ) && ( navigator.userAgent.indexOf( 'iPad' ) == -1 ) ) {
             //只能在这里做，要不无法触发
-            Utils.listen( document.body, 'keydown keyup keypress', this._firePharse.bind( this ) );
+            Utils.listen( document.body, 'keydown keyup keypress paste', this._firePharse.bind( this ) );
         }
     },
     _firePharse: function ( e ) {

src/core/minder.js

@@ -28,7 +28,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
 
         this._paper = new kity.Paper();
         this._paper.getNode().setAttribute( 'contenteditable', true );
-        this._paper.getNode().ondragstart = function(e) {
+        this._paper.getNode().ondragstart = function ( e ) {
             e.preventDefault();
         };
 
@@ -64,47 +64,48 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
         this._shortcutkeys = {};
         this._bindshortcutKeys();
     },
-    isTextEditStatus:function(){
+    isTextEditStatus: function () {
         return false;
     },
     addShortcutKeys: function ( cmd, keys ) {
-        var obj = {},km = this;
+        var obj = {}, km = this;
         if ( keys ) {
             obj[ cmd ] = keys
         } else {
             obj = cmd;
         }
-        utils.each(obj,function(k,v){
-            km._shortcutkeys[k.toLowerCase()] = v;
-        });
+        utils.each( obj, function ( k, v ) {
+            km._shortcutkeys[ k.toLowerCase() ] = v;
+        } );
 
     },
-    getShortcutKey : function(cmdName){
-        return this._shortcutkeys[cmdName]
+    getShortcutKey: function ( cmdName ) {
+        return this._shortcutkeys[ cmdName ]
     },
     _bindshortcutKeys: function () {
         var me = this,
             shortcutkeys = this._shortcutkeys;
-        function checkkey(key,keyCode,e){
-            switch(key){
-                case  'ctrl':
-                case 'cmd':
-                    if(e.ctrlKey || e.metaKey){
-                        return true;
-                    }
-                    break;
-                case 'alt':
-                    if(e.altKey){
-                        return true
-                    }
-                    break;
-                case 'shift':
-                    if(e.shiftKey){
-                        return true;
-                    }
+
+        function checkkey( key, keyCode, e ) {
+            switch ( key ) {
+            case 'ctrl':
+            case 'cmd':
+                if ( e.ctrlKey || e.metaKey ) {
+                    return true;
+                }
+                break;
+            case 'alt':
+                if ( e.altKey ) {
+                    return true
+                }
+                break;
+            case 'shift':
+                if ( e.shiftKey ) {
+                    return true;
+                }
 
             }
-            if(keyCode == keymap[key]){
+            if ( keyCode == keymap[ key ] ) {
                 return true;
             }
             return false
@@ -114,15 +115,15 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
             var originEvent = e.originEvent;
             var keyCode = originEvent.keyCode || originEvent.which;
             for ( var i in shortcutkeys ) {
-                var keys = shortcutkeys[ i ].toLowerCase().split('+');
+                var keys = shortcutkeys[ i ].toLowerCase().split( '+' );
                 var current = 0;
-                utils.each(keys,function(i,k){
-                    if(checkkey(k,keyCode,originEvent)){
+                utils.each( keys, function ( i, k ) {
+                    if ( checkkey( k, keyCode, originEvent ) ) {
                         current++;
                     }
-                });
+                } );
 
-                if(current == keys.length){
+                if ( current == keys.length ) {
                     if ( me.queryCommandState( i ) != -1 )
                         me.execCommand( i );
                     originEvent.preventDefault();
@@ -132,38 +133,38 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
             }
         } );
     },
-    _initContextmenu:function(){
+    _initContextmenu: function () {
         this.contextmenus = [];
     },
-    addContextmenu:function(item){
-        if(utils.isArray(item)){
-            this.contextmenus = this.contextmenus.concat(item);
-        }else{
-            this.contextmenus.push(item);
+    addContextmenu: function ( item ) {
+        if ( utils.isArray( item ) ) {
+            this.contextmenus = this.contextmenus.concat( item );
+        } else {
+            this.contextmenus.push( item );
         }
 
         return this;
     },
-    getContextmenu:function(){
+    getContextmenu: function () {
         return this.contextmenus;
     },
-    _initStatus:function(){
+    _initStatus: function () {
         this._status = "normal";
         this._rollbackStatus = "normal";
     },
-    setStatus:function(status){
-        if(status){
+    setStatus: function ( status ) {
+        if ( status ) {
             this._rollbackStatus = this._status;
             this._status = status;
-        }else{
+        } else {
             this._status = '';
         }
         return this;
     },
-    rollbackStatus:function(){
+    rollbackStatus: function () {
         this._status = this._rollbackStatus;
     },
-    getStatus:function(){
+    getStatus: function () {
         return this._status;
     }
 } );

src/module/editor.js

@@ -41,6 +41,8 @@ KityMinder.registerModule( "TextEditModule", function () {
                         node = selectionShape.getData('relatedNode');
                         e.stopPropagationImmediately();
                     }
+                    if(this.getStatus() == 'textedit')
+                        this.fire('contentchange');
                     km.setStatus('normal')
                 }
                 if(node){

src/module/editor.range.js

@@ -35,6 +35,7 @@ Minder.Range = kity.createClass('Range',{
             startOffset:range.startOffset
         }
     },
+
     collapse:function(toStart){
         this.nativeRange.collapse(toStart === true);
         return this;
@@ -42,5 +43,10 @@ Minder.Range = kity.createClass('Range',{
     insertNode:function(node){
         this.nativeRange.insertNode(node);
         return this;
+    },
+    updateNativeRange:function(){
+
+        this.nativeRange = this.nativeSel.getRangeAt(0);
+        return this;
     }
 });
\ No newline at end of file

src/module/editor.receiver.js

@@ -5,6 +5,7 @@ Minder.Receiver = kity.createClass('Receiver',{
         this.selection && this.selection.setHide();
         this.range && this.range.nativeSel.removeAllRanges();
         this.index = 0;
+        this.inputLength = 0;
         return this;
     },
     setTextEditStatus : function(status){
@@ -22,7 +23,7 @@ Minder.Receiver = kity.createClass('Receiver',{
         _div.className = 'km_receiver';
         this.container = document.body.insertBefore(_div,document.body.firstChild);
         utils.addCssRule('km_receiver_css',' .km_receiver{position:absolute;padding:0;margin:0;word-wrap:break-word;clip:rect(1em 1em 1em 1em);}');//
-        this.km.on('textedit.beforekeyup textedit.keydown', utils.proxy(this.keyboardEvents,this));
+        this.km.on('textedit.beforekeyup textedit.keydown textedit.paste', utils.proxy(this.keyboardEvents,this));
         this.timer = null;
         this.index = 0;
     },
@@ -74,8 +75,32 @@ Minder.Receiver = kity.createClass('Receiver',{
         var orgEvt = e.originEvent;
         var keyCode = orgEvt.keyCode;
         var keys = KityMinder.keymap;
+        function setTextToContainer(){
+            var text = me.container.textContent.replace(/[\u200b\t\r\n]/g,'');
 
+            if(me.textShape.getOpacity() == 0){
+                me.textShape.setOpacity(1);
+            }
+            me.textShape.setContent(text);
+            me.setContainerStyle();
+            me.minderNode.setText(text);
+            if(text.length == 0){
+                me.textShape.setContent('a');
+                me.textShape.setOpacity(0);
+            }
+            me.km.updateLayout(me.minderNode);
+            me.setBaseOffset();
+            me.updateTextData();
+
+            me.updateIndex();
+            me.updateSelection();
+
+            me.timer = setTimeout(function(){
+                me.selection.setShow()
+            },500);
+        }
         switch(e.type){
+
             case 'keydown':
                 switch ( e.originEvent.keyCode ) {
                     case keys.Enter:
@@ -86,8 +111,33 @@ Minder.Receiver = kity.createClass('Receiver',{
                         e.preventDefault();
                         break;
                 }
+
+                if ( e.originEvent.ctrlKey ||  e.originEvent.metaKey ){
+
+                    //粘贴
+                    if(keyCode == keymap.v){
+
+                        setTimeout(function(){
+                            me.range.updateNativeRange().insertNode($('<span>$$_kityminder_bookmark_$$</span>')[0]);
+                            me.container.innerHTML = me.container.textContent.replace(/[\u200b\t\r\n]/g,'');
+                            var index = me.container.textContent.indexOf('$$_kityminder_bookmark_$$');
+                            me.container.textContent = me.container.textContent.replace('$$_kityminder_bookmark_$$','');
+                            me.range.setStart(me.container.firstChild,index).collapse(true).select();
+                            setTextToContainer()
+                        },100);
+                    }
+                    //剪切
+                    if(keyCode == keymap.x){
+                        setTimeout(function(){
+                            setTextToContainer()
+                        },100);
+                    }
+                    return;
+                }
                 break;
             case 'beforekeyup':
+
+
                 switch(keyCode){
                     case keymap.Enter:
                     case keymap.Tab:
@@ -105,34 +155,14 @@ Minder.Receiver = kity.createClass('Receiver',{
                         return;
 
                 }
-                var text = this.container.textContent.replace(/\u200b/g,'');
-
-                if(this.textShape.getOpacity() == 0){
-                    this.textShape.setOpacity(1);
-                }
-                this.textShape.setContent(text);
-                this.setContainerStyle();
-                this.minderNode.setText(text);
-                if(text.length == 0){
-                    this.textShape.setContent('a');
-                    this.textShape.setOpacity(0);
-                }
-                this.km.updateLayout(this.minderNode);
-                this.setBaseOffset();
-                this.updateTextData();
-                this.updateIndex();
-                this.updateSelection();
 
-                this.timer = setTimeout(function(){
-                    me.selection.setShow()
-                },500);
+                setTextToContainer();
                 return true;
-
-
         }
 
 
     },
+
     updateIndex:function(){
         this.index = this.range.getStart().startOffset;
     },

src/module/layout.default.js

@@ -551,14 +551,6 @@ KityMinder.registerModule( "LayoutDefault", function () {
 				node.setType( "main" );
 			} else {
 				node.setType( "sub" );
-				var isExpand = parent.getData( "expand" );
-				if ( isExpand === undefined ) {
-					isExpand = true;
-					parent.setData( "expand", isExpand );
-				}
-				// if ( !isExpand ) {
-				// 	return false;
-				// }
 			}
 			//计算位置等流程
 			updateBg( node );

src/module/select.js

@@ -101,6 +101,7 @@ KityMinder.registerModule( "Select", function () {
                 if ( !downNode ) {
                     this.removeAllSelectedNodes();
                     marqueeActivator.selectStart( e );
+
                     this.setStatus('normal')
                 }