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
75cfec60
Commit
75cfec60
authored
Jul 07, 2014
by
techird
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix context menu conflic
parent
2b1116d6
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
7 deletions
+10
-7
contextmenu.js
src/adapter/contextmenu.js
+5
-2
minder.event.js
src/core/minder.event.js
+5
-5
No files found.
src/adapter/contextmenu.js
View file @
75cfec60
...
@@ -27,10 +27,13 @@ KM.registerUI( 'contextmenu', function () {
...
@@ -27,10 +27,13 @@ KM.registerUI( 'contextmenu', function () {
}
}
});
});
me
.
$container
.
append
(
$menu
);
me
.
$container
.
append
(
$menu
);
me
.
on
(
'
aftercontextmenu'
,
function
(
e
)
{
me
.
on
(
'
contextmenu'
,
function
(
e
)
{
e
.
preventDefault
();
e
.
preventDefault
();
});
me
.
on
(
'mouseup'
,
function
(
e
)
{
//e.preventDefault();
if
(
me
.
getStatus
()
==
'hand'
)
return
;
if
(
me
.
getStatus
()
==
'hand'
||
!
e
.
isRightMB
()
)
return
;
var
node
=
e
.
getTargetNode
();
var
node
=
e
.
getTargetNode
();
if
(
node
){
if
(
node
){
...
...
src/core/minder.event.js
View file @
75cfec60
...
@@ -43,11 +43,11 @@ kity.extendClass(Minder, {
...
@@ -43,11 +43,11 @@ kity.extendClass(Minder, {
if
(
this
.
_fire
(
beforeEvent
))
{
if
(
this
.
_fire
(
beforeEvent
))
{
return
;
return
;
}
}
preEvent
=
new
MinderEvent
(
'pre'
+
e
.
type
,
e
,
fals
e
);
preEvent
=
new
MinderEvent
(
'pre'
+
e
.
type
,
e
,
tru
e
);
executeEvent
=
new
MinderEvent
(
e
.
type
,
e
,
fals
e
);
executeEvent
=
new
MinderEvent
(
e
.
type
,
e
,
tru
e
);
this
.
_fire
(
preEvent
)
;
this
.
_fire
(
preEvent
)
||
this
.
_fire
(
executeEvent
);
this
.
_fire
(
executeEvent
)
||
this
.
_fire
(
new
MinderEvent
(
'after'
+
e
.
type
,
e
,
false
));
this
.
_fire
(
new
MinderEvent
(
'after'
+
e
.
type
,
e
,
false
));
if
(
~
'mousedown mouseup keydown keyup'
.
indexOf
(
e
.
type
))
{
if
(
~
'mousedown mouseup keydown keyup'
.
indexOf
(
e
.
type
))
{
...
...
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