Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Dropdown] Show "no results" when filterRemoteData is false and response is empty #300

Merged
merged 4 commits into from
Dec 17, 2018
Merged

[Dropdown] Show "no results" when filterRemoteData is false and response is empty #300

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9c69ca6
fix(dropdown): display "no results fround" when remote api returns no…
lubber-de Dec 12, 2018
8b32ff7
fix(dropdown): display "no results fround" only, if no additions are …
lubber-de Dec 12, 2018
cef03a4
Merge branch 'develop' into fix/6603/empty_menu_remotedata
Dec 13, 2018
0a30cec
fix(dropdown): add `,` to variable assignment
Dec 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions src/definitions/modules/dropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,16 +782,17 @@ $.fn.dropdown = function(parameters) {
},
onSuccess : function(response) {
var
values = response[fields.remoteValues],
hasRemoteValues = (Array.isArray(values) && values.length > 0)
values = response[fields.remoteValues]
;
if(hasRemoteValues) {
module.remove.message();
module.setup.menu({
values: response[fields.remoteValues]
});
if (!Array.isArray(values)){
values = [];
}
else {
module.remove.message();
module.setup.menu({
values: values
});

if(values.length===0 && !settings.allowAdditions) {
module.add.message(message.noResults);
}
callback();
Expand Down Expand Up @@ -4008,7 +4009,7 @@ $.fn.dropdown.settings.templates = {
// generates just menu from select
menu: function(response, fields) {
var
values = response[fields.values] || {},
values = response[fields.values] || [],
html = ''
;
$.each(values, function(index, option) {
Expand Down