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
53c078b2
Commit
53c078b2
authored
Apr 16, 2014
by
Akikonata
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://github.com/fex-team/kityminder
into dev
parents
5756ed4e
429bd8ab
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
4 deletions
+6
-4
saveto.js
src/adapter/saveto.js
+2
-1
combobox.js
src/ui/combobox.js
+4
-3
No files found.
src/adapter/saveto.js
View file @
53c078b2
...
@@ -10,7 +10,8 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
...
@@ -10,7 +10,8 @@ KM.registerToolbarUI( 'saveto', function ( name ) {
itemStyles
:
[],
itemStyles
:
[],
value
:
[],
value
:
[],
autowidthitem
:
[],
autowidthitem
:
[],
enabledRecord
:
false
enabledRecord
:
false
,
enabledSelected
:
false
},
},
$combox
=
null
,
$combox
=
null
,
comboboxWidget
=
null
;
comboboxWidget
=
null
;
...
...
src/ui/combobox.js
View file @
53c078b2
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
"<%}%>"
+
"<%}%>"
+
"<%}%>"
+
"<%}%>"
+
"<%for( var i=0, label; label = items[i]; i++ ) {%>"
+
"<%for( var i=0, label; label = items[i]; i++ ) {%>"
+
"<li class=
\"
<%=itemClassName%><%if( selected == i ) {%> kmui-combobox-checked<%}%> kmui-combobox-item-<%=i%><%if( disabled[ i ] === true ) {%> kmui-combobox-item-disabled<%}%>
\"
data-item-index=
\"
<%=i%>
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
>"
+
"<li class=
\"
<%=itemClassName%><%if( selected == i
&& enabledSelected
) {%> kmui-combobox-checked<%}%> kmui-combobox-item-<%=i%><%if( disabled[ i ] === true ) {%> kmui-combobox-item-disabled<%}%>
\"
data-item-index=
\"
<%=i%>
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
>"
+
"<span class=
\"
kmui-combobox-icon
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
></span>"
+
"<span class=
\"
kmui-combobox-icon
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
></span>"
+
"<label class=
\"
<%=labelClassName%>
\"
style=
\"
<%=itemStyles[ i ]%>
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
><%=label%></label>"
+
"<label class=
\"
<%=labelClassName%>
\"
style=
\"
<%=itemStyles[ i ]%>
\"
unselectable=
\"
on
\"
onmousedown=
\"
return false
\"
><%=label%></label>"
+
"</li>"
+
"</li>"
+
...
@@ -52,7 +52,8 @@
...
@@ -52,7 +52,8 @@
autoRecord
:
true
,
autoRecord
:
true
,
//最多记录条数
//最多记录条数
recordCount
:
5
,
recordCount
:
5
,
enabledRecord
:
true
enabledRecord
:
true
,
enabledSelected
:
true
},
},
init
:
function
(
options
){
init
:
function
(
options
){
...
@@ -332,7 +333,7 @@
...
@@ -332,7 +333,7 @@
var
options
=
this
.
data
(
"options"
),
var
options
=
this
.
data
(
"options"
),
newStack
=
[];
newStack
=
[];
debugger
if
(
this
.
data
(
'options'
).
enabledRecord
){
if
(
this
.
data
(
'options'
).
enabledRecord
){
$
.
each
(
options
.
recordStack
,
function
(
i
,
item
){
$
.
each
(
options
.
recordStack
,
function
(
i
,
item
){
...
...
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