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
843b4528
Commit
843b4528
authored
Feb 27, 2014
by
campaign
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://github.com/kitygraph/kityminder
into dev
Conflicts: src/ui/dropmenu.js
parents
b9f823a5
6eaf842e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
minder.js
src/core/minder.js
+3
-0
dropmenu.js
src/ui/dropmenu.js
+7
-7
menu.js
src/ui/menu.js
+1
-1
dialog.css
themes/default/css/dialog.css
+1
-1
dropmenu.css
themes/default/css/dropmenu.css
+3
-2
No files found.
src/core/minder.js
View file @
843b4528
...
...
@@ -27,6 +27,9 @@ var Minder = KityMinder.Minder = kity.createClass( "KityMinder", {
this
.
_paper
=
new
kity
.
Paper
();
this
.
_paper
.
getNode
().
setAttribute
(
'contenteditable'
,
true
);
this
.
_paper
.
getNode
().
ondragstart
=
function
(
e
)
{
e
.
preventDefault
();
};
this
.
_addRenderContainer
();
...
...
src/ui/dropmenu.js
View file @
843b4528
src/ui/menu.js
View file @
843b4528
...
...
@@ -31,7 +31,7 @@ KM.ui.define('menu',{
var
me
=
this
;
if
(
!
$obj
.
data
(
'$mergeObj'
)){
$obj
.
data
(
'$mergeObj'
,
me
.
root
());
if
(
$obj
.
kmui
()
.
wrapclick
){
if
(
$obj
.
kmui
()){
$obj
.
on
(
'wrapclick'
,
function
(
evt
){
me
.
supper
.
show
.
call
(
me
,
$obj
,
''
,
'offset'
,
15
)
});
...
...
themes/default/css/dialog.css
View file @
843b4528
.kmui-modal
{
position
:
fixed
;
top
:
1
0px
;
top
:
6
0px
;
right
:
10px
;
background-color
:
#ffffff
;
outline
:
0
;
...
...
themes/default/css/dropmenu.css
View file @
843b4528
...
...
@@ -20,11 +20,12 @@
.kmui-dropdown-menu
.kmui-divider
{
height
:
1px
;
margin
:
9
px
0
;
margin
:
5
px
0
;
overflow
:
hidden
;
background-color
:
#e5e5e5
;
}
.kmui-dropdown-menu
.kmui-divider
:first-child
{
.kmui-dropdown-menu
.kmui-divider
:first-child
,
.kmui-dropdown-menu
.kmui-divider
:last-child
{
display
:
none
;
}
...
...
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