From: David Epely <esion99@gmail.com>
Date: Wed, 13 Jul 2016 14:52:45 +0000 (+0200)
Subject: [JS-dropdown] fix float-right is ommited when last in classes
X-Git-Tag: v6.2.4-rc1~53^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=970fd1e468ddb88a80c69d64ce10ddfe86b20c19;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

[JS-dropdown] fix float-right is ommited when last in classes
---

diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js
index 5e913fb44..2350da492 100644
--- a/js/foundation.dropdown.js
+++ b/js/foundation.dropdown.js
@@ -71,9 +71,10 @@ class Dropdown {
   getPositionClass() {
     var verticalPosition = this.$element[0].className.match(/(top|left|right|bottom)/g);
         verticalPosition = verticalPosition ? verticalPosition[0] : '';
-    var horizontalPosition = /float-(\S+)\s/.exec(this.$anchor[0].className);
+    var horizontalPosition = /float-(\S+)\s?/.exec(this.$anchor[0].className);
         horizontalPosition = horizontalPosition ? horizontalPosition[1] : '';
     var position = horizontalPosition ? horizontalPosition + ' ' + verticalPosition : verticalPosition;
+
     return position;
   }
 
diff --git a/test/javascript/components/dropdown.js b/test/javascript/components/dropdown.js
index 7c1bdf47f..42f2f6cad 100644
--- a/test/javascript/components/dropdown.js
+++ b/test/javascript/components/dropdown.js
@@ -51,5 +51,14 @@ describe('Dropdown', function() {
 
       plugin.getPositionClass().trim().should.equal('right');
     });
+
+    it('has horizontal position and only one class', function() {
+      $dropdownController = $(getDropdownController('float-right'))
+        .appendTo('body');
+      $dropdownContainer = $(getDropdownContainer()).appendTo('body');
+      plugin = new Foundation.Dropdown($dropdownContainer, {});
+
+      plugin.getPositionClass().trim().should.equal('right');
+    });
   });
 });