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

diff --git a/js/foundation.dropdown.js b/js/foundation.dropdown.js
index 5e913fb44857950f735ba16f9f3eb9f00775ae0e..2350da49215980dd74fac7fed6b1b8ce98d33fec 100644 (file)
--- 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 7c1bdf47f78049931fb1e557b3f59daec3984727..42f2f6cad0e51b1f1bd6ba7d1bae5ca71dcb1b80 100644 (file)
--- 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');
+    });
   });
 });