Commit 53c078b2 authored by Akikonata's avatar Akikonata

Merge branch 'dev' of https://github.com/fex-team/kityminder into dev

parents 5756ed4e 429bd8ab
...@@ -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;
......
...@@ -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 ){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment