fix event delegation and setting default element

avetisk · Feb 25, 2014 · 5ecd12a · 5ecd12a
1 parent 6ea43fc
commit 5ecd12a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/view.js b/lib/view.js
@@ -15,11 +15,12 @@ var dom = document.createElement('div');
  * @return {View}
  */
 var View = module.exports = function (options) {
+  EventEmitter.call(this);
+
   this.options = defaults(options || {}, View.defaultOptions);
   this._bindings = [];
-  this._el = this.options.el;
 
-  EventEmitter.call(this);
+  this.options.el && (this.el = this.options.el);
 };
 
 var prototype = View.prototype = Object.create(EventEmitter.prototype);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ak-view",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "client side view",
   "keywords": [
     "view"

diff --git a/test/index.js b/test/index.js
@@ -65,20 +65,22 @@ describe('View', function () {
   });
 
   it('view#el = dom, view#el = dom2', function (done) {
+    var el = createElement('bolo');
     var dom = createElement('hari');
     var dom2 = createElement('haribol');
-    var parents = [dom, dom2];
+    var parents = [el, dom, dom2];
     var counterElement = 0;
     var counterDelegate = 0;
     var counterUndelegate = 0;
 
     var view = new View({
+      'el': el,
       'domEvents': {
         'span': {
           'click': function (e) {
             assert.equal(e.target.parentElement, parents.shift());
 
-            if (! parents.length && counterElement === 2 && counterDelegate === 2 && counterUndelegate === 1) {
+            if (! parents.length && counterElement === 2 && counterDelegate === 2 && counterUndelegate === 2) {
               done();
             }
           }
@@ -102,6 +104,8 @@ describe('View', function () {
       view.el = '';
     }, '`el` must be a HTMLElement.');
 
+    view.el.querySelector('span').click();
+
     view.el = dom;
     view.el.querySelector('span').click();