Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kityminder-core
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
吴志俊
kityminder-core
Commits
2f33dd30
Commit
2f33dd30
authored
Jul 07, 2014
by
techird
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix event conflic
parent
890bdcdc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
contextmenu.js
src/adapter/contextmenu.js
+2
-2
dragtree.js
src/module/dragtree.js
+1
-0
editor.js
src/module/editor.js
+0
-1
view.js
src/module/view.js
+2
-1
No files found.
src/adapter/contextmenu.js
View file @
2f33dd30
...
...
@@ -27,7 +27,7 @@ KM.registerUI( 'contextmenu', function () {
}
});
me
.
$container
.
append
(
$menu
);
me
.
on
(
'contextmenu'
,
function
(
e
)
{
me
.
on
(
'
after
contextmenu'
,
function
(
e
)
{
e
.
preventDefault
();
if
(
me
.
getStatus
()
==
'hand'
)
return
;
...
...
@@ -65,7 +65,7 @@ KM.registerUI( 'contextmenu', function () {
}
});
me
.
on
(
'click'
,
function
(){
me
.
on
(
'
after
click'
,
function
(){
$menu
.
kmui
().
hide
();
});
me
.
on
(
'beforemousedown'
,
function
(
e
){
...
...
src/module/dragtree.js
View file @
2f33dd30
...
...
@@ -335,6 +335,7 @@ KityMinder.registerModule('DragTree', function() {
events
:
{
'normal.mousedown inputready.mousedown'
:
function
(
e
)
{
// 单选中根节点也不触发拖拽
if
(
e
.
originEvent
.
button
)
return
;
if
(
e
.
getTargetNode
()
&&
e
.
getTargetNode
()
!=
this
.
getRoot
())
{
dragger
.
dragStart
(
e
.
getPosition
(
this
.
getRenderContainer
()));
}
...
...
src/module/editor.js
View file @
2f33dd30
...
...
@@ -54,7 +54,6 @@ KityMinder.registerModule('TextEditModule', function() {
'normal.beforemousedown textedit.beforemousedown inputready.beforemousedown'
:
function
(
e
)
{
//右键直接退出
if
(
e
.
isRightMB
())
{
e
.
stopPropagationImmediately
();
return
;
}
...
...
src/module/view.js
View file @
2f33dd30
...
...
@@ -28,7 +28,8 @@ var ViewDragger = kity.createClass("ViewDragger", {
lastPosition
=
null
,
currentPosition
=
null
;
this
.
_minder
.
on
(
'normal.beforemousedown readonly.mousedown readonly.touchstart'
,
function
(
e
)
{
this
.
_minder
.
on
(
'normal.mousedown readonly.mousedown readonly.touchstart'
,
function
(
e
)
{
console
.
log
(
e
);
e
.
originEvent
.
preventDefault
();
// 阻止中键拉动
// 点击未选中的根节点临时开启
if
(
e
.
getTargetNode
()
==
this
.
getRoot
()
||
e
.
originEvent
.
button
==
2
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment