diff --git a/src/core/functions.js b/src/core/functions.js index 0ed7d9a..8065dfe 100644 --- a/src/core/functions.js +++ b/src/core/functions.js @@ -91,16 +91,16 @@ function changeQuery(state, options, query) { return state; } -function startLoading(state, options) { - if (options.onLoaded) { - options.onLoaded(); - } +function startLoading(state) { return $.extend({}, state, { itemsLoading: true, }); } -function finishLoading(state) { +function finishLoading(state, options) { + if (options.onLoaded) { + options.onLoaded(); + } return $.extend({}, state, { itemsLoading: false, itemsLoaded: true, diff --git a/src/virtual-select.js b/src/virtual-select.js index 62c482d..83d7653 100644 --- a/src/virtual-select.js +++ b/src/virtual-select.js @@ -102,7 +102,7 @@ function VirtualSelect(element, userOptions) { } changeState(fn.startLoading(state)); return options.dataProvider.load().then(() => { - changeState(fn.finishLoading(state)); + changeState(fn.finishLoading(state, options)); }); }