Make Elemental.load() accept HTML with multiple root nodes.

elementaljs · Nov 1, 2013 · f2b47cf · f2b47cf
1 parent 76c9170
commit f2b47cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/spec/elemental_spec.js b/spec/elemental_spec.js
@@ -38,6 +38,13 @@ describe("Elemental", function(){
           expect(bar).toHaveBeenCalled();
       });
 
+      it("should load behaviors on all top-level container elements", function() {
+          bar = jasmine.createSpy('bar');
+          var container = "<div data-behavior='bar'> </div>   <div data-behavior='bar'> </div>";
+          Elemental.load(container);
+          expect(bar.callCount).toEqual(2);
+      });
+
       describe("when the container is some specific DOM", function() {
         it("should load a behavior nested deeply beneath the container element", function() {
             baz = jasmine.createSpy('baz');

diff --git a/src/elemental.js b/src/elemental.js
@@ -29,12 +29,7 @@
     };
 
     ns.load = function(container) {
-        var $selector;
-        $selector = $('[data-behavior]', container);
-
-        if ($(container).data('behavior')) {
-            $selector = $selector.add(container);
-        }
+        var $selector = $('[data-behavior]', container).add($(container).filter('[data-behavior]'));
 
         $selector.each(function(index, element) {
             var $element = $(element);