fix(dropdown): show "no results" when filterRemoteData is false and r…

…esponse is empty
fomantic · Dec 17, 2018 · 68b1d7a · 68b1d7a
1 parent 67f3b70
commit 68b1d7a
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/src/definitions/modules/dropdown.js b/src/definitions/modules/dropdown.js
@@ -786,16 +786,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();
@@ -4057,7 +4058,7 @@ $.fn.dropdown.settings.templates = {
   // generates just menu from select
   menu: function(response, fields, preserveHTML) {
     var
-      values = response[fields.values] || {},
+      values = response[fields.values] || [],
       html   = '',
       escape = $.fn.dropdown.settings.templates.escape
     ;