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
a902f05e
Commit
a902f05e
authored
Sep 25, 2015
by
张博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug selectionchange event when another animate is on going
parent
16c41390
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
1 deletion
+23
-1
view.js
src/module/view.js
+23
-1
No files found.
src/module/view.js
View file @
a902f05e
...
@@ -30,6 +30,9 @@ define(function(require, exports, module) {
...
@@ -30,6 +30,9 @@ define(function(require, exports, module) {
paper
.
setStyle
(
'cursor'
,
value
?
'-webkit-grab'
:
'default'
);
paper
.
setStyle
(
'cursor'
,
value
?
'-webkit-grab'
:
'default'
);
this
.
_enabled
=
value
;
this
.
_enabled
=
value
;
},
},
timeline
:
function
()
{
return
this
.
_moveTimeline
;
},
move
:
function
(
offset
,
duration
)
{
move
:
function
(
offset
,
duration
)
{
var
minder
=
this
.
_minder
;
var
minder
=
this
.
_minder
;
...
@@ -52,7 +55,7 @@ define(function(require, exports, module) {
...
@@ -52,7 +55,7 @@ define(function(require, exports, module) {
function
(
target
,
value
)
{
function
(
target
,
value
)
{
dragger
.
moveTo
(
value
);
dragger
.
moveTo
(
value
);
}
}
),
duration
,
'easeOutCubic'
);
),
duration
,
'easeOutCubic'
)
.
timeline
()
;
this
.
_moveTimeline
.
on
(
'finish'
,
function
()
{
this
.
_moveTimeline
.
on
(
'finish'
,
function
()
{
dragger
.
_moveTimeline
=
null
;
dragger
.
_moveTimeline
=
null
;
...
@@ -334,6 +337,7 @@ define(function(require, exports, module) {
...
@@ -334,6 +337,7 @@ define(function(require, exports, module) {
},
},
'selectionchange layoutallfinish'
:
function
(
e
)
{
'selectionchange layoutallfinish'
:
function
(
e
)
{
var
selected
=
this
.
getSelectedNode
();
var
selected
=
this
.
getSelectedNode
();
var
minder
=
this
;
/*
/*
* Added by zhangbobell 2015.9.9
* Added by zhangbobell 2015.9.9
...
@@ -346,6 +350,24 @@ define(function(require, exports, module) {
...
@@ -346,6 +350,24 @@ define(function(require, exports, module) {
if
(
!
selected
)
return
;
if
(
!
selected
)
return
;
var
dragger
=
this
.
_viewDragger
;
var
dragger
=
this
.
_viewDragger
;
var
timeline
=
dragger
.
timeline
();
/*
* Added by zhangbobell 2015.09.25
* 如果之前有动画,那么就先暂时返回,等之前动画结束之后再次执行本函数
* 以防止 view 动画变动了位置,导致本函数执行的时候位置计算不对
*
* fixed bug : 初始化的时候中心节点位置不固定(有的时候在左上角,有的时候在中心)
* */
if
(
timeline
){
timeline
.
on
(
'finish'
,
function
()
{
minder
.
fire
(
'selectionchange'
);
});
return
;
}
var
view
=
dragger
.
getView
();
var
view
=
dragger
.
getView
();
var
focus
=
selected
.
getLayoutBox
();
var
focus
=
selected
.
getLayoutBox
();
var
space
=
50
;
var
space
=
50
;
...
...
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