Skip to content

K
kityminder-core
Commit 2dda4048 authored by Akikonata's avatar Akikonata
Browse files
Options

Merge branch 'dev' of https://github.com/kitygraph/kityminder into dev

parents 4a844e22 ee406ba3
Expand all Show whitespace changes
Inline Side-by-side
Showing with 292 additions and 216 deletions
demo/dev.html deleted 100644 → 0
View file @ 4a844e22
<!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 @ 2dda4048
......@@ -60,7 +60,7 @@
},
'cancel': {}
},
width: 200,
width: 200
} )
} )();
\ No newline at end of file
dist/dev.js
View file @ 2dda4048
This diff is collapsed.
dist/dev.php
View file @ 2dda4048
......@@ -71,6 +71,7 @@ $dependency = Array(
,'src/protocal/svg.js'
);
$content = "";
......
dist/social.js
View file @ 2dda4048
......@@ -91,7 +91,7 @@ $( function () {
var options = {
response_type: 'token',
media_type: 'baidu',
redirect_uri: baseUrl + 'index.html',
redirect_uri: window.location.href,
client_type: 'web'
};
baidu.frontia.social.login( options );
......@@ -129,7 +129,7 @@ $( function () {
by: 'time',
success: function ( result ) {
if ( result.list.length ) {
if ( !isShareLink ) {
if ( !isShareLink && !thisMapFilename ) {
loadPersonal( result.list[ 0 ].path );
} else {
$user_btn.loading( false );
......@@ -141,7 +141,7 @@ $( function () {
}
function addToRecentMenu( list ) {
list.splice(8);
list.splice( 8 );
list.forEach( function ( file ) {
$user_menu.appendItem( {
item: {
......@@ -290,7 +290,7 @@ $( function () {
function loadShare() {
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;
var shareId = match[ 1 ];
var query = new baidu.frontia.storage.Query();
......@@ -308,11 +308,23 @@ $( function () {
} );
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();
currentUser = baidu.frontia.getCurrentAccount();
if ( currentUser ) {
setCurrentUser( currentUser );
loadPath();
if(thisMapFilename) {
loadPersonal( thisMapFilename );
}
} else {
$login_btn.appendTo( $panel );
}
......
kity @ ebccc80b
Subproject commit a9630e638b29633f62cdc2df239bc702118b231a
Subproject commit ebccc80ba41995fa718b1fb0b8f7d79938501ed1
src/adapter/contextmenu.js
View file @ 2dda4048
......@@ -62,18 +62,8 @@ KM.registerUI( 'contextmenu', function () {
$menu.kmui().hide();
});
me.on('beforemousedown',function(e){
var isRightMB;
if ("which" in e.originEvent) // Gecko (Firefox), WebKit (Safari/Chrome) & Opera
isRightMB = e.originEvent.which == 3;
else if ("button" in e.originEvent) // IE, Opera
isRightMB = e.originEvent.button == 2;
if(isRightMB){
if(e.isRightMB()){
e.stopPropagationImmediately();
}
})
} );
......
src/core/event.js
View file @ 2dda4048
......@@ -41,5 +41,16 @@ var MinderEvent = kity.createClass( 'MindEvent', {
},
preventDefault:function(){
this.originEvent.preventDefault();
},
isRightMB:function(){
var isRightMB = false;
if(!this.originEvent){
return false;
}
if ("which" in this.originEvent)
isRightMB = this.originEvent.which == 3;
else if ("button" in this.originEvent)
isRightMB = this.originEvent.button == 2;
return isRightMB;
}
} );
\ No newline at end of file
src/core/minder.event.js
View file @ 2dda4048
......@@ -27,6 +27,7 @@ kity.extendClass( Minder, {
_firePharse: function ( e ) {
var beforeEvent, preEvent, executeEvent;
beforeEvent = new MinderEvent( 'before' + e.type, e, true );
if ( this._fire( beforeEvent ) ) {
return;
......@@ -44,6 +45,7 @@ kity.extendClass( Minder, {
},
_interactChange: function ( e ) {
var minder = this;
clearTimeout( this._interactTimeout );
this._interactTimeout = setTimeout( function () {
var stoped = minder._fire( new MinderEvent( 'beforeinteractchange' ) );
......@@ -59,10 +61,23 @@ kity.extendClass( Minder, {
callbacks.push( callback );
},
_fire: function ( e ) {
var callbacks = this._eventCallbacks[ e.type.toLowerCase() ];
if ( !callbacks ) {
return false;
var status = this.getStatus();
var callbacks = this._eventCallbacks[ e.type.toLowerCase() ] || [];
if(status){
callbacks = callbacks.concat(this._eventCallbacks[ status + '.' + e.type.toLowerCase() ] || []);
}
if(callbacks.length == 0){
return;
}
for ( var i = 0; i < callbacks.length; i++ ) {
callbacks[ i ].call( this, e );
if ( e.shouldStopPropagationImmediately() ) {
......@@ -72,16 +87,18 @@ kity.extendClass( Minder, {
return e.shouldStopPropagation();
},
on: function ( name, callback ) {
var types = name.split( ' ' );
for ( var i = 0; i < types.length; i++ ) {
this._listen( types[ i ].toLowerCase(), callback );
}
var km = this;
utils.each(name.split(/\s+/),function(i,n){
km._listen( n.toLowerCase(), callback );
});
return this;
},
off: function ( name, callback ) {
var types = name.split( ' ' );
var types = name.split( /\s+/);
var i, j, callbacks, removeIndex;
for ( i = 0; i < types.length; i++ ) {
callbacks = this._eventCallbacks[ types[ i ].toLowerCase() ];
if ( callbacks ) {
removeIndex = null;
......
src/core/minder.js
View file @ 2dda4048
......@@ -5,6 +5,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
this._initEvents();
this._initMinder();
this._initSelection();
this._initStatus();
this._initShortcutKey();
this._initContextmenu();
this._initModules();
......@@ -109,6 +110,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
return false
}
me.on( 'keydown', function ( e ) {
var originEvent = e.originEvent;
var keyCode = originEvent.keyCode || originEvent.which;
for ( var i in shortcutkeys ) {
......@@ -119,10 +121,7 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
current++;
}
});
//todo 暂时通过receiver判断
if(me.isTextEditStatus()){
return;
}
if(current == keys.length){
if ( me.queryCommandState( i ) != -1 )
me.execCommand( i );
......@@ -147,6 +146,25 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
},
getContextmenu:function(){
return this.contextmenus;
},
_initStatus:function(){
this._status = "normal";
this._rollbackStatus = "normal";
},
setStatus:function(status){
if(status){
this._rollbackStatus = this._status;
this._status = status;
}else{
this._status = '';
}
return this;
},
rollbackStatus:function(){
this._status = this._rollbackStatus;
},
getStatus:function(){
return this._status;
}
} );
......
src/core/node.js
View file @ 2dda4048
......@@ -180,7 +180,7 @@ var MinderNode = KityMinder.MinderNode = kity.createClass( "MinderNode", {
node.parent.removeChild( node );
}
node.parent = this;
node.root = parent.root;
node.root = node.parent.root;
this.children.splice( index, 0, node );
},
......
src/module/editor.js
View file @ 2dda4048
......@@ -26,16 +26,9 @@ KityMinder.registerModule( "TextEditModule", function () {
this.getPaper().addShape(sel);
},
"events": {
'beforemousedown':function(e){
var isRightMB;
'normal.beforemousedown textedit.beforemousedown':function(e){
if ("which" in e.originEvent) // Gecko (Firefox), WebKit (Safari/Chrome) & Opera
isRightMB = e.originEvent.which == 3;
else if ("button" in e.originEvent) // IE, Opera
isRightMB = e.originEvent.button == 2;
if(isRightMB){
if(e.isRightMB()){
e.stopPropagationImmediately();
return;
}
......@@ -48,6 +41,7 @@ KityMinder.registerModule( "TextEditModule", function () {
node = selectionShape.getData('relatedNode');
e.stopPropagationImmediately();
}
km.setStatus('normal')
}
if(node){
var textShape = node.getTextShape();
......@@ -56,6 +50,7 @@ KityMinder.registerModule( "TextEditModule", function () {
if ( this.isSingleSelect() && node.isSelected()) {// && e.kityEvent.targetShape.getType().toLowerCase()== 'text'
sel.collapse();
node.getTextShape().setStyle('cursor','text');
km.setStatus('textedit');
receiver.setTextEditStatus(true)
.setSelection(sel)
.setKityMinder(this)
......@@ -74,10 +69,11 @@ KityMinder.registerModule( "TextEditModule", function () {
sel.setShow();
selectionByClick = false;
}
km.setStatus('textedit')
}
}
},
'mouseup':function(e){
'normal.mouseup textedit.mouseup':function(e){
if(mouseDownStatus){
if(!sel.collapsed ){
try{
......@@ -93,7 +89,7 @@ KityMinder.registerModule( "TextEditModule", function () {
mouseDownStatus = false;
oneTime = 0;
},
'beforemousemove':function(e){
'textedit.beforemousemove':function(e){
if(mouseDownStatus){
e.stopPropagationImmediately();
......@@ -112,7 +108,7 @@ KityMinder.registerModule( "TextEditModule", function () {
}
},
'dblclick':function(e){
'normal.dblclick textedit.dblclick':function(e){
var text = e.kityEvent.targetShape;
if ( text.getType().toLowerCase()== 'text') {
......@@ -121,8 +117,8 @@ KityMinder.registerModule( "TextEditModule", function () {
sel.setEndOffset(text.getContent().length);
sel.setShow();
receiver.setContainerTxt(text.getContent()).updateSelectionShow(1)
.updateRange(range).setTextEditStatus(true)
.updateRange(range).setTextEditStatus(true);
km.setStatus('textedit');
}
},
'restoreScene':function(){
......@@ -131,6 +127,7 @@ KityMinder.registerModule( "TextEditModule", function () {
'stopTextEdit':function(){
sel.setHide();
receiver.clear().setTextEditStatus(false);
km.setStatus('normal');
},
"resize": function ( e ) {
sel.setHide();
......@@ -148,6 +145,7 @@ KityMinder.registerModule( "TextEditModule", function () {
textShape.setStyle('cursor','default');
node.getTextShape().setStyle('cursor','text');
km.setStatus('textedit');
receiver.setTextEditStatus(true)
.setSelection(sel)
.setKityMinder(this)
......@@ -185,8 +183,12 @@ KityMinder.registerModule( "TextEditModule", function () {
}
receiver.clear().setTextEditStatus(false);
if(this.getStatus() == 'textedit'){
this.setStatus('normal')
}
},
'selectionclear':function(){
km.setStatus('normal');
receiver.setTextEditStatus(false).clear()
}
}
......
src/module/editor.receiver.js
View file @ 2dda4048
......@@ -3,6 +3,7 @@ Minder.Receiver = kity.createClass('Receiver',{
clear : function(){
this.container.innerHTML = '';
this.selection && this.selection.setHide();
this.range && this.range.nativeSel.removeAllRanges();
this.index = 0;
return this;
},
......@@ -21,7 +22,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('beforekeyup', utils.proxy(this.keyboardEvents,this));
this.km.on('textedit.beforekeyup textedit.keydown', utils.proxy(this.keyboardEvents,this));
this.timer = null;
this.index = 0;
},
......@@ -72,14 +73,26 @@ Minder.Receiver = kity.createClass('Receiver',{
var me = this;
var orgEvt = e.originEvent;
var keyCode = orgEvt.keyCode;
switch(e.type){
var keys = KityMinder.keymap;
switch(e.type){
case 'keydown':
switch ( e.originEvent.keyCode ) {
case keys.Enter:
case keys.Tab:
this.selection.setHide();
this.clear().setTextEditStatus(false);
this.km.setStatus('normal');
e.preventDefault();
break;
}
break;
case 'beforekeyup':
if(this.isTextEditStatus()){
switch(keyCode){
case keymap.Enter:
case keymap.Tab:
if(this.keydownNode === this.minderNode){
this.rollbackStatus();
this.setTextEditStatus(false);
this.clear();
}
......@@ -114,9 +127,11 @@ Minder.Receiver = kity.createClass('Receiver',{
me.selection.setShow()
},500);
return true;
}
}
},
updateIndex:function(){
this.index = this.range.getStart().startOffset;
......
src/module/hand.js
View file @ 2dda4048
......@@ -17,6 +17,9 @@ var ViewDragger = kity.createClass( "ViewDragger", {
paper.setStyle( 'cursor', value ? '-webkit-grab' : 'default' );
this._enabled = value;
},
move: function ( offset ) {
this._minder.getRenderContainer().translate( offset.x, offset.y );
},
_bind: function () {
var dragger = this,
......@@ -24,7 +27,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
lastPosition = null,
currentPosition = null;
this._minder.on( 'beforemousedown', function ( e ) {
this._minder.on( 'hand.beforemousedown', function ( e ) {
// 已经被用户打开拖放模式
if ( dragger.isEnabled() ) {
lastPosition = e.getPosition();
......@@ -33,7 +36,7 @@ var ViewDragger = kity.createClass( "ViewDragger", {
}
// 点击未选中的根节点临时开启
else if ( e.getTargetNode() == this.getRoot() &&
(!this.getRoot().isSelected() || !this.isSingleSelect())) {
( !this.getRoot().isSelected() || !this.isSingleSelect() ) ) {
lastPosition = e.getPosition();
dragger.setEnabled( true );
isRootDrag = true;
......@@ -41,20 +44,19 @@ var ViewDragger = kity.createClass( "ViewDragger", {
} )
.on( 'beforemousemove', function ( e ) {
.on( 'hand.beforemousemove', function ( e ) {
if ( lastPosition ) {
currentPosition = e.getPosition();
// 当前偏移加上历史偏移
var offset = kity.Vector.fromPoints( lastPosition, currentPosition );
this.getRenderContainer().translate( offset.x, offset.y );
dragger.move( offset );
e.stopPropagation();
lastPosition = currentPosition;
}
} )
.on( 'mouseup', function ( e ) {
.on( 'hand.mouseup', function ( e ) {
lastPosition = null;
// 临时拖动需要还原状态
......@@ -67,10 +69,20 @@ var ViewDragger = kity.createClass( "ViewDragger", {
} );
KityMinder.registerModule( 'Hand', function () {
var km = this;
var ToggleHandCommand = kity.createClass( "ToggleHandCommand", {
base: Command,
execute: function ( minder ) {
minder._viewDragger.setEnabled( !minder._viewDragger.isEnabled() );
if(minder._viewDragger.isEnabled()){
minder.setStatus('hand')
}else{
minder.rollbackStatus()
}
},
queryState: function ( minder ) {
return minder._viewDragger.isEnabled() ? 1 : 0;
......@@ -90,6 +102,23 @@ KityMinder.registerModule( 'Hand', function () {
this.execCommand( 'hand' );
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/keyboard.js
View file @ 2dda4048
......@@ -66,26 +66,10 @@ KityMinder.registerModule( "KeyboardModule", function () {
contentchange: function () {
buildPositionNetwork( this.getRoot() );
},
keydown: function ( e ) {
"normal.keydown": function ( e ) {
var keys = KityMinder.keymap;
if ( this.receiver.isTextEditStatus() ) {
switch ( e.originEvent.keyCode ) {
case keys.Enter:
case keys.Tab:
this.fire( 'stopTextEdit' );
e.preventDefault();
break;
case keys.Backspace:
case keys.Del:
case keys.Left:
case keys.Up:
case keys.Right:
case keys.Down:
break;
}
return;
}
var node = e.getTargetNode();
this.receiver.keydownNode = node;
switch ( e.originEvent.keyCode ) {
......
src/module/select.js
View file @ 2dda4048
......@@ -93,7 +93,7 @@ KityMinder.registerModule( "Select", function () {
var lastDownNode = null;
return {
"events": {
mousedown: function ( e ) {
"normal.mousedown textedit.mousedown": function ( e ) {
var downNode = e.getTargetNode();
// 没有点中节点：
......@@ -101,6 +101,7 @@ KityMinder.registerModule( "Select", function () {
if ( !downNode ) {
this.removeAllSelectedNodes();
marqueeActivator.selectStart( e );
this.setStatus('normal')
}
// 点中了节点，并且按了 shift 键：
......@@ -122,8 +123,8 @@ KityMinder.registerModule( "Select", function () {
lastDownNode = downNode;
}
},
mousemove: marqueeActivator.selectMove,
mouseup: function ( e ) {
"normal.mousemove textedit.mousemove": marqueeActivator.selectMove,
"normal.mouseup textedit.mouseup": function ( e ) {
var upNode = e.getTargetNode();
// 如果 mouseup 发生在 lastDownNode 外，是无需理会的
......
src/ui/widget.js
View file @ 2dda4048
......@@ -142,7 +142,7 @@
return obj.root()[_prefix + className].apply(obj.root(), arguments)
} else {
$el && obj.root($el);
obj.init && obj.init(!options || $.isPlainObject(options) ? $.extend2(options || {}, obj.defaultOpt || {}, true) : options);
obj.init && obj.init(utils.clonePlainObject(!options || $.isPlainObject(options) ? $.extend2(options || {}, obj.defaultOpt || {}, true) : options));
try{
obj.root().find('a').click(function (evt) {
evt.preventDefault()
......
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