Merge branch 'dev' of github.com:fex-team/kityminder into dev

dialogs/markers/markers.js

@@ -43,23 +43,6 @@
                 $w.find( "li[type='progress'][value='" + valPro + "']" ).addClass( "active" );
             } );
         },
-        buttons: {
-            'ok': {
-                exec: function ( km, $w ) {
-                    var href = $( '#kmui-link-Jhref' ).val().replace( /^\s+|\s+$/g, '' );
-
-                    if ( href ) {
-                        km.execCommand( 'link', {
-                            'href': href,
-                            'target': $( "#kmui-link-Jtarget:checked" ).length ? "_blank" : '_self',
-                            'title': $( "#kmui-link-Jtitle" ).val().replace( /^\s+|\s+$/g, '' ),
-                            '_href': href
-                        } );
-                    }
-                }
-            },
-            'cancel': {}
-        },
         width: 200
 
     } )

src/adapter/adapter.js

@@ -126,7 +126,7 @@ utils.extend( KityMinder, function () {
             km.fire('selectionclear');
             pro.initContent( km, $widget );
             //在dialog上阻止键盘冒泡，导致跟编辑输入冲突的问题
-            $widget.on('keydown keyup keypress mousedown mouseup',function(e){
+            $widget.on('keydown keyup keypress',function(e){
                 e.stopPropagation()
             });
             if ( !pro._preventDefault ) {

src/module/layout.js

@@ -254,7 +254,8 @@ KityMinder.registerModule( "LayoutModule", function () {
 				target.clearLayout();
 				var sourceLayout = source.getLayout();
 				var targetLayout = target.getLayout();
-				targetLayout.expand = sourceLayout.expand;
+
+				targetLayout.expand = utils.clone(sourceLayout.expand);
 				console.log( targetLayout );
 			}
 		},