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
75811083
Commit
75811083
authored
May 06, 2014
by
campaign
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复dialog不能二次弹出的问题
parent
e08f3cb0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
18 deletions
+1
-18
markers.js
dialogs/markers/markers.js
+0
-17
adapter.js
src/adapter/adapter.js
+1
-1
No files found.
dialogs/markers/markers.js
View file @
75811083
...
@@ -43,23 +43,6 @@
...
@@ -43,23 +43,6 @@
$w
.
find
(
"li[type='progress'][value='"
+
valPro
+
"']"
).
addClass
(
"active"
);
$w
.
find
(
"li[type='progress'][value='"
+
valPro
+
"']"
).
addClass
(
"active"
);
}
);
}
);
},
},
buttons
:
{
'ok'
:
{
exec
:
function
(
km
,
$w
)
{
var
href
=
$
(
'#kmui-link-Jhref'
).
val
().
replace
(
/^
\s
+|
\s
+$/g
,
''
);
if
(
href
)
{
km
.
execCommand
(
'link'
,
{
'href'
:
href
,
'target'
:
$
(
"#kmui-link-Jtarget:checked"
).
length
?
"_blank"
:
'_self'
,
'title'
:
$
(
"#kmui-link-Jtitle"
).
val
().
replace
(
/^
\s
+|
\s
+$/g
,
''
),
'_href'
:
href
}
);
}
}
},
'cancel'
:
{}
},
width
:
200
width
:
200
}
)
}
)
...
...
src/adapter/adapter.js
View file @
75811083
...
@@ -126,7 +126,7 @@ utils.extend( KityMinder, function () {
...
@@ -126,7 +126,7 @@ utils.extend( KityMinder, function () {
km
.
fire
(
'selectionclear'
);
km
.
fire
(
'selectionclear'
);
pro
.
initContent
(
km
,
$widget
);
pro
.
initContent
(
km
,
$widget
);
//在dialog上阻止键盘冒泡,导致跟编辑输入冲突的问题
//在dialog上阻止键盘冒泡,导致跟编辑输入冲突的问题
$widget
.
on
(
'keydown keyup keypress
mousedown mouseup
'
,
function
(
e
){
$widget
.
on
(
'keydown keyup keypress'
,
function
(
e
){
e
.
stopPropagation
()
e
.
stopPropagation
()
});
});
if
(
!
pro
.
_preventDefault
)
{
if
(
!
pro
.
_preventDefault
)
{
...
...
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