Skip to content

K
kityminder-core
Commit 1ad7b1d1 authored by campaign's avatar campaign
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 0ec90d2d 0b314a0c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 186 additions and 143 deletions
demo/dev.html deleted 100644 → 0
View file @ 0ec90d2d
<!DOCTYPE html>
<html>
<head>
<script src="../dist/jquery-2.1.0.min.js"></script>
<script src="../kity/dist/kitygraph.all.js"></script>
<script src="../configure.js"></script>
<script src="../dist/dev.js"></script>
<script src="../lang/zh-cn/zh-cn.js" charset="utf-8"></script>
<link href="../themes/default/css/import.css" type="text/css" rel="stylesheet">
<style>
.km_receiver{
width:0;
height:0;
}
.km-minderNode{
cursor:default;
}
.kmui-container {
height: 100%;
}
html, body, div {
margin: 0;
padding: 0;
}
</style>
</head>
<body >
<div id="kityminder" style="height:100%;width:100%" onselectstart="return false">
</div>
</body>
<script>
window.km = KM.getKityMinder('kityminder');
</script>
</html>
\ No newline at end of file
dialogs/markers/markers.js
View file @ 1ad7b1d1
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
}, },
'cancel': {} 'cancel': {}
}, },
width: 200, width: 200
} ) } )
} )(); } )();
\ No newline at end of file
dist/dev.js
View file @ 1ad7b1d1
This diff is collapsed.
dist/social.js
View file @ 1ad7b1d1
...@@ -91,7 +91,7 @@ $( function () { ...@@ -91,7 +91,7 @@ $( function () {
var options = { var options = {
response_type: 'token', response_type: 'token',
media_type: 'baidu', media_type: 'baidu',
redirect_uri: baseUrl + 'index.html', redirect_uri: window.location.href,
client_type: 'web' client_type: 'web'
}; };
baidu.frontia.social.login( options ); baidu.frontia.social.login( options );
...@@ -129,7 +129,7 @@ $( function () { ...@@ -129,7 +129,7 @@ $( function () {
by: 'time', by: 'time',
success: function ( result ) { success: function ( result ) {
if ( result.list.length ) { if ( result.list.length ) {
if ( !isShareLink ) { if ( !isShareLink && !thisMapFilename ) {
loadPersonal( result.list[ 0 ].path ); loadPersonal( result.list[ 0 ].path );
} else { } else {
$user_btn.loading( false ); $user_btn.loading( false );
...@@ -141,7 +141,7 @@ $( function () { ...@@ -141,7 +141,7 @@ $( function () {
} }
function addToRecentMenu( list ) { function addToRecentMenu( list ) {
list.splice(8); list.splice( 8 );
list.forEach( function ( file ) { list.forEach( function ( file ) {
$user_menu.appendItem( { $user_menu.appendItem( {
item: { item: {
...@@ -290,7 +290,7 @@ $( function () { ...@@ -290,7 +290,7 @@ $( function () {
function loadShare() { function loadShare() {
var pattern = /share_id=(\w+)([&#]|$)/; var pattern = /share_id=(\w+)([&#]|$)/;
var match = pattern.exec( window.location.href ); var match = pattern.exec( window.location ) || pattern.exec( document.referrer );
if ( !match ) return; if ( !match ) return;
var shareId = match[ 1 ]; var shareId = match[ 1 ];
var query = new baidu.frontia.storage.Query(); var query = new baidu.frontia.storage.Query();
...@@ -308,11 +308,23 @@ $( function () { ...@@ -308,11 +308,23 @@ $( function () {
} ); } );
isShareLink = true; isShareLink = true;
} }
function loadPath() {
var pattern = /path=(.+?)([&#]|$)/;
var match = pattern.exec( window.location ) || pattern.exec( document.referrer );
if ( !match ) return;
thisMapFilename = decodeURIComponent( match[ 1 ] );
}
loadShare(); loadShare();
currentUser = baidu.frontia.getCurrentAccount(); currentUser = baidu.frontia.getCurrentAccount();
if ( currentUser ) { if ( currentUser ) {
setCurrentUser( currentUser ); setCurrentUser( currentUser );
loadPath();
if(thisMapFilename) {
loadPersonal( thisMapFilename );
}
} else { } else {
$login_btn.appendTo( $panel ); $login_btn.appendTo( $panel );
} }
......
kity @ ebccc80b
Subproject commit a9630e638b29633f62cdc2df239bc702118b231a Subproject commit ebccc80ba41995fa718b1fb0b8f7d79938501ed1
src/adapter/saveto.js
View file @ 1ad7b1d1
...@@ -39,8 +39,8 @@ KM.registerToolbarUI( 'saveto', function ( name ) { ...@@ -39,8 +39,8 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
var transform = renderContainer.getTransform(); var transform = renderContainer.getTransform();
renderContainer.resetTransform(); renderContainer.resetTransform();
var svg = $( svghtml ).attr( { var svg = $( svghtml ).attr( {
width: renderBox.x + renderBox.width, width: renderBox.width,
height: renderBox.y + renderBox.height, height: renderBox.height,
viewBox: null viewBox: null
} ); } );
var div = $( "<div></div>" ).append( svg ); var div = $( "<div></div>" ).append( svg );
......
src/core/node.js
View file @ 1ad7b1d1
...@@ -180,7 +180,7 @@ var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", { ...@@ -180,7 +180,7 @@ var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", {
node.parent.removeChild( node ); node.parent.removeChild( node );
} }
node.parent = this; node.parent = this;
node.root = parent.root; node.root = node.parent.root;
this.children.splice( index, 0, node ); this.children.splice( index, 0, node );
}, },
......
src/module/hand.js
View file @ 1ad7b1d1
...@@ -17,6 +17,9 @@ var ViewDragger = kity.createClass( "ViewDragger", { ...@@ -17,6 +17,9 @@ var ViewDragger = kity.createClass( "ViewDragger", {
paper.setStyle( 'cursor', value ? '-webkit-grab' : 'default' ); paper.setStyle( 'cursor', value ? '-webkit-grab' : 'default' );
this._enabled = value; this._enabled = value;
}, },
move: function ( offset ) {
this._minder.getRenderContainer().translate( offset.x, offset.y );
},
_bind: function () { _bind: function () {
var dragger = this, var dragger = this,
...@@ -33,7 +36,7 @@ var ViewDragger = kity.createClass( "ViewDragger", { ...@@ -33,7 +36,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
} }
// 点击未选中的根节点临时开启 // 点击未选中的根节点临时开启
else if ( e.getTargetNode() == this.getRoot() && else if ( e.getTargetNode() == this.getRoot() &&
(!this.getRoot().isSelected() || !this.isSingleSelect())) { ( !this.getRoot().isSelected() || !this.isSingleSelect() ) ) {
lastPosition = e.getPosition(); lastPosition = e.getPosition();
dragger.setEnabled( true ); dragger.setEnabled( true );
isRootDrag = true; isRootDrag = true;
...@@ -47,8 +50,7 @@ var ViewDragger = kity.createClass( "ViewDragger", { ...@@ -47,8 +50,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
// 当前偏移加上历史偏移 // 当前偏移加上历史偏移
var offset = kity.Vector.fromPoints( lastPosition, currentPosition ); var offset = kity.Vector.fromPoints( lastPosition, currentPosition );
dragger.move( offset );
this.getRenderContainer().translate( offset.x, offset.y );
e.stopPropagation(); e.stopPropagation();
lastPosition = currentPosition; lastPosition = currentPosition;
} }
...@@ -100,6 +102,23 @@ KityMinder.registerModule( 'Hand', function () { ...@@ -100,6 +102,23 @@ KityMinder.registerModule( 'Hand', function () {
this.execCommand( 'hand' ); this.execCommand( 'hand' );
e.preventDefault(); e.preventDefault();
} }
},
mousewheel: function ( e ) {
var dx = e.originEvent.wheelDeltaX || 0,
dy = e.originEvent.wheelDeltaY || e.originEvent.wheelDelta;
this._viewDragger.move( {
x: dx / 2.5,
y: dy / 2.5
} );
e.originEvent.preventDefault();
},
dblclick: function() {
var viewport = this.getPaper().getViewPort();
var offset = this.getRoot().getRenderContainer(this.getRenderContainer()).getTransform().getTranslate();
var dx = viewport.center.x - offset.x,
dy = viewport.center.y - offset.y;
//this.getRenderContainer().fxTranslate(dx, dy, 300);
} }
} }
}; };
......
src/module/layout.bottom.js
View file @ 1ad7b1d1
...@@ -408,9 +408,11 @@ KityMinder.registerModule( "LayoutBottom", function () { ...@@ -408,9 +408,11 @@ KityMinder.registerModule( "LayoutBottom", function () {
appendChildNode: function ( parent, node, sibling ) { appendChildNode: function ( parent, node, sibling ) {
node.clearLayout(); node.clearLayout();
var parentLayout = parent.getLayout(); var parentLayout = parent.getLayout();
var expand = parent.getData( "expand" );
//设置分支类型 //设置分支类型
if ( parent.getType() === "root" ) { if ( parent.getType() === "root" ) {
node.setType( "main" ); node.setType( "main" );
node.setData( "expand", true );
minder.handelNodeInsert( node ); minder.handelNodeInsert( node );
} else { } else {
node.setType( "sub" ); node.setType( "sub" );
...@@ -490,8 +492,15 @@ KityMinder.registerModule( "LayoutBottom", function () { ...@@ -490,8 +492,15 @@ KityMinder.registerModule( "LayoutBottom", function () {
} }
}, },
expandNode: function ( ico ) { expandNode: function ( ico ) {
var isExpand = ico.icon.switchState(); var isExpand, node;
var node = ico.icon._node; if ( ico instanceof MinderNode ) {
node = ico;
isExpand = node.getLayout().shicon.switchState();
} else {
isExpand = ico.icon.switchState();
node = ico.icon._node;
}
node.setData( "expand", isExpand );
var _buffer = node.getChildren(); var _buffer = node.getChildren();
var _cleanbuffer = []; var _cleanbuffer = [];
......
src/module/layout.default.js
View file @ 1ad7b1d1
...@@ -537,6 +537,7 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -537,6 +537,7 @@ KityMinder.registerModule( "LayoutDefault", function () {
node.setType( "main" ); node.setType( "main" );
} else { } else {
node.setType( "sub" ); node.setType( "sub" );
//var isExpand = parent.getData( "expand" );
} }
//计算位置等流程 //计算位置等流程
updateBg( node ); updateBg( node );
...@@ -600,8 +601,15 @@ KityMinder.registerModule( "LayoutDefault", function () { ...@@ -600,8 +601,15 @@ KityMinder.registerModule( "LayoutDefault", function () {
} }
}, },
expandNode: function ( ico ) { expandNode: function ( ico ) {
var isExpand = ico.icon.switchState(); var isExpand, node;
var node = ico.icon._node; if ( ico instanceof MinderNode ) {
node = ico;
isExpand = node.getLayout().shicon.switchState();
} else {
isExpand = ico.icon.switchState();
node = ico.icon._node;
}
node.setData( "expand", isExpand );
var _buffer = node.getChildren(); var _buffer = node.getChildren();
var _cleanbuffer = []; var _cleanbuffer = [];
......
src/module/layout.js
View file @ 1ad7b1d1
...@@ -106,6 +106,9 @@ KityMinder.registerModule( "LayoutModule", function () { ...@@ -106,6 +106,9 @@ KityMinder.registerModule( "LayoutModule", function () {
base: Command, base: Command,
execute: function ( km, node ) { execute: function ( km, node ) {
var parent = km.getSelectedNode(); var parent = km.getSelectedNode();
if ( parent.getType() !== "root" && parent.getChildren().length !== 0 && parent.getData( "expand" ) === false ) {
km.expandNode( parent );
}
km.appendChildNode( parent, node ); km.appendChildNode( parent, node );
km.select( node, true ); km.select( node, true );
return node; return node;
...@@ -129,7 +132,6 @@ KityMinder.registerModule( "LayoutModule", function () { ...@@ -129,7 +132,6 @@ KityMinder.registerModule( "LayoutModule", function () {
node.setType( "main" ); node.setType( "main" );
km.appendChildNode( selectedNode, node ); km.appendChildNode( selectedNode, node );
} else { } else {
node.setType( "sub" );
km.appendSiblingNode( selectedNode, node ); km.appendSiblingNode( selectedNode, node );
} }
km.select( node, true ); km.select( node, true );
...@@ -203,26 +205,23 @@ KityMinder.registerModule( "LayoutModule", function () { ...@@ -203,26 +205,23 @@ KityMinder.registerModule( "LayoutModule", function () {
this.initStyle( this.getRoot() ); this.initStyle( this.getRoot() );
} }
}, },
'contextmenu':[ 'contextmenu': [ {
{ label: this.getLang( 'node.appendsiblingnode' ),
label:this.getLang('node.appendsiblingnode'), exec: function () {
exec:function(){ this.execCommand( 'appendsiblingnode', new MinderNode( this.getLang( 'topic' ) ) )
this.execCommand('appendsiblingnode',new MinderNode(this.getLang('topic')))
},
cmdName:'appendsiblingnode'
},
{
label:this.getLang('node.appendchildnode'),
exec:function(){
this.execCommand('appendchildnode',new MinderNode(this.getLang('topic')))
}, },
cmdName:'appendchildnode' cmdName: 'appendsiblingnode'
}, {
label: this.getLang( 'node.appendchildnode' ),
exec: function () {
this.execCommand( 'appendchildnode', new MinderNode( this.getLang( 'topic' ) ) )
}, },
{ cmdName: 'appendchildnode'
label:this.getLang('node.removenode'), }, {
cmdName:'removenode' label: this.getLang( 'node.removenode' ),
},{ cmdName: 'removenode'
divider:1 }, {
divider: 1
} }
], ],
......
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