diff --git a/src/BoxSelect.css b/src/BoxSelect.css index 4920654..38be90f 100644 --- a/src/BoxSelect.css +++ b/src/BoxSelect.css @@ -6,6 +6,7 @@ } .x-boxselect ul.x-boxselect-list { padding: 1px 3px; + margin: 0px; } ul.x-boxselect-list.x-boxselect-singleselect { white-space: nowrap; @@ -19,7 +20,7 @@ ul.x-boxselect-list.x-boxselect-singleselect { } .x-boxselect-input input, .x-boxselect-input div { border: none; - background: none; + background-color: inherit; line-height: 18px !important; height: 20px; width: 100%; diff --git a/src/BoxSelect.js b/src/BoxSelect.js index 7060292..0c244b6 100644 --- a/src/BoxSelect.js +++ b/src/BoxSelect.js @@ -554,30 +554,21 @@ Ext.define('Ext.ux.form.field.BoxSelect', { * Used to determine if a record is filtered out of the current store's data set, * for determining if a currently selected value should be retained. * - * Slightly complicated logic. A record is considered filtered and should be retained if: + * A record is considered filtered and should be retained if: * - * - It is not in the combo store and the store has no filter or it is in the filtered data set + * - It is not in the combo store and it is in the value store * (Happens when our selected value is just part of a different load, page or query) - * - It is not in the combo store and forceSelection is false and it is in the value store * (Happens when our selected value was created manually) * * @private */ isFilteredRecord: function(record) { var me = this, - store = me.store, valueField = me.valueField, - storeRecord, - filtered = false; + value = record.get(valueField); - storeRecord = store.findExact(valueField, record.get(valueField)); - - filtered = ((storeRecord === -1) && (!store.snapshot || (me.findRecord(valueField, record.get(valueField)) !== false))); - - filtered = filtered || (!filtered && (storeRecord === -1) && (me.forceSelection !== true) && - (me.valueStore.findExact(valueField, record.get(valueField)) >= 0)); - - return filtered; + return (me.store.findExact(valueField, value) === -1) && + (me.valueStore.findExact(valueField, value) !== -1); }, /** @@ -1067,7 +1058,7 @@ Ext.define('Ext.ux.form.field.BoxSelect', { me.multiSelectItemTpl = [ '', - '
  • ', ' selected', '',