Resolves issue#10657 (When closeOnClick option is true, clicking on the dropdown...

diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js
index ed054feeceff92ad24f3205169c7fcc399b0cc4a..f1da4c5411199121b7ce76f21124ca55172e1560 100644 (file)
--- a/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@ -205,7 +205,7 @@ class Dropdown extends Positionable {
             if(_this.$anchors.is(e.target) || _this.$anchors.find(e.target).length) {
               return;
             }
-            if(_this.$element.find(e.target).length) {
+            if(_this.$element.is(e.target) || _this.$element.find(e.target).length) {
               return;
             }
             _this.close();

diff --git a/test/javascript/components/dropdown.js b/test/javascript/components/dropdown.js
index 6a7e029fc5b7166c9fa1a7255baca247315bb00c..608ce0087969acbd60185adc0b3a9744d8f72df5 100644 (file)
--- a/test/javascript/components/dropdown.js
+++ b/test/javascript/components/dropdown.js
@@ -77,4 +77,24 @@ describe('Dropdown', function() {
       plugin.alignment.should.equal('right')
     });
   });
+
+  describe('closeOnClick option', function() {
+    it('not closes a dropdown by clicking on the dropdown if closeOnClick option is true', function(done) {
+      $dropdownController = $(getDropdownController()).appendTo('body');
+      $dropdownContainer = $(getDropdownContainer()).appendTo('body');
+      plugin = new Foundation.Dropdown($dropdownContainer, {closeOnClick: true});
+
+      // Open it first...
+      plugin.open();
+
+      let spy = sinon.spy(plugin, 'close');
+
+      plugin.$element.trigger("click");
+
+      setTimeout(function() {
+        sinon.assert.notCalled(spy);
+        done();
+      }, 2);
+    });
+  });
 });