Merge pull request #96 from mstenquist/allow_multiple_content_classes

Allow multiple content classes
HubSpot · Jan 5, 2015 · 741fcac · 741fcac
2 parents 5645d38 + 1e5cbe5
commit 741fcac
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/coffee/vex.coffee b/coffee/vex.coffee
@@ -111,8 +111,11 @@ vexFactory = ($) ->
 
             return options.$vexContent # For chaining
 
+        getSelectorFromBaseClass: (baseClass) ->
+            return ".#{baseClass.split(' ').join('.')}"
+
         getAllVexes: ->
-            return $(""".#{vex.baseClassNames.vex}:not(".#{vex.baseClassNames.closing}") .#{vex.baseClassNames.content}""")
+            return $(""".#{vex.baseClassNames.vex}:not(".#{vex.baseClassNames.closing}") #{vex.getSelectorFromBaseClass(vex.baseClassNames.content)}""")
 
         getVexByID: (id) ->
             return vex.getAllVexes().filter(-> $(@).data().vex.id is id)

diff --git a/coffee/vex.dialog.coffee b/coffee/vex.dialog.coffee
@@ -129,7 +129,7 @@ vexDialogFactory = ($, vex) ->
             $button = $("""<button type="#{button.type}"></button>""")
                 .text(button.text)
                 .addClass(button.className + ' vex-dialog-button ' + (if index is 0 then 'vex-first ' else '') + (if index is buttons.length - 1 then 'vex-last ' else ''))
-                .bind('click.vex', (e) -> button.click($(@).parents(".#{vex.baseClassNames.content}"), e) if button.click)
+                .bind('click.vex', (e) -> button.click($(@).parents(vex.getSelectorFromBaseClass(vex.baseClassNames.content)), e) if button.click)
 
             $button.appendTo $buttons
 

diff --git a/js/vex.combined.min.js b/js/vex.combined.min.js
diff --git a/js/vex.dialog.js b/js/vex.dialog.js
@@ -130,7 +130,7 @@
         var $button;
         $button = $("<button type=\"" + button.type + "\"></button>").text(button.text).addClass(button.className + ' vex-dialog-button ' + (index === 0 ? 'vex-first ' : '') + (index === buttons.length - 1 ? 'vex-last ' : '')).bind('click.vex', function(e) {
           if (button.click) {
-            return button.click($(this).parents("." + vex.baseClassNames.content), e);
+            return button.click($(this).parents(vex.getSelectorFromBaseClass(vex.baseClassNames.content)), e);
           }
         });
         return $button.appendTo($buttons);