Merge branch 'master' of github.com:ampersandjs/ampersand-view into renaming-get

Author: HenrikJoreteg

ampersand-view.js

@@ -17,6 +17,9 @@ function View(attrs) {
     this.on('change:el', this._handleElementChange, this);
     this._parsedBindings = bindings(this.bindings);
     this._initializeBindings();
+    if (attrs.el && !this.autoRender) {
+        this._handleElementChange();
+    }
     this._initializeSubviews();
     this.initialize.apply(this, arguments);
     this.set(_.pick(attrs, viewOptions));

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ampersand-view",
   "description": "A smart base view for Backbone apps, to make it easy to bind collections and properties to the DOM.",
-  "version": "6.0.9",
+  "version": "6.0.11",
   "author": "Henrik Joreteg <henrik@andyet.net>",
   "browser": "./ampersand-view.js",
   "bugs": "https://github.com/ampersandjs/ampersand-view/issues",
@@ -14,7 +14,7 @@
     "events-mixin": "^1.1.0",
     "get-object-path": "^0.0.2",
     "matches-selector": "^1.0.0",
-    "underscore": "^1.6.0"
+    "underscore": "1.6.0"
   },
   "devDependencies": {
     "ampersand-model": "~2.10.6",

test/main.js

@@ -622,3 +622,23 @@ test('make sure template can return a dom node', function (t) {
 
     t.end();
 });
+
+test('events are bound if there is an el in the constructor', function (t) {
+    t.plan(1);
+    var event = document.createEvent("MouseEvent");
+    var View = AmpersandView.extend({
+        template: function () {
+            return document.createElement('div');
+        },
+        events: {
+            'click div': 'divClicked'
+        },
+        divClicked: function (e) {
+            t.ok(true, 'event fired');
+            t.end();
+        }
+    });
+    var view = new View({el: document.createElement('div')});
+    event.initMouseEvent('click');
+    view.el.dispatchEvent(event);
+});