diff --git a/can-define.js b/can-define.js
index 5f1226e..4022431 100644
--- a/can-define.js
+++ b/can-define.js
@@ -83,16 +83,9 @@ module.exports = define = ns.define = function(objPrototype, defines, baseDefine
return data;
});
+ // Mixin the event methods
+ define.mixinEvents(objPrototype);
- // Add necessary event methods to this object.
- for (var prop in eventsProto) {
- Object.defineProperty(objPrototype, prop, {
- enumerable: false,
- value: eventsProto[prop],
- configurable: true,
- writable: true
- });
- }
// add so instance defs can be dynamically added
Object.defineProperty(objPrototype,"_define",{
enumerable: false,
@@ -177,7 +170,7 @@ define.property = function(objPrototype, prop, definition, dataInitializers, com
if ((definition.value !== undefined || definition.Value !== undefined)) {
getInitialValue = make.get.defaultValue(prop, definition, typeConvert, eventsSetter);
}
-
+
// If property has a getter, create the compute that stores its data.
if (definition.get) {
computedInitializers[prop] = make.compute(prop, definition.get, getInitialValue);
@@ -281,7 +274,7 @@ make = {
if (newVal !== current) {
setData.call(this, newVal);
- canEvent.dispatch.call(this, {
+ canEvent.trigger.call(this, {
type: prop,
target: this
}, [newVal, current]);
@@ -643,47 +636,12 @@ replaceWith = function(obj, prop, cb, writable) {
eventsProto = assign({}, event);
assign(eventsProto, {
_eventSetup: function() {},
- _eventTeardown: function() {},
- addEventListener: function(eventName, handler) {
-
- var computedBinding = this._computed && this._computed[eventName];
- if (computedBinding && computedBinding.compute) {
- if (!computedBinding.count) {
- computedBinding.count = 1;
- computedBinding.compute.addEventListener("change", computedBinding.handler);
- } else {
- computedBinding.count++;
- }
-
- }
-
- return eventLifecycle.addAndSetup.apply(this, arguments);
- },
-
- // ### unbind
- // Stops listening to an event.
- // If this is the last listener of a computed property,
- // stop forwarding events of the computed property to this map.
- removeEventListener: function(eventName, handler) {
- var computedBinding = this._computed && this._computed[eventName];
- if (computedBinding) {
- if (computedBinding.count === 1) {
- computedBinding.count = 0;
- computedBinding.compute.removeEventListener("change", computedBinding.handler);
- } else {
- computedBinding.count--;
- }
-
- }
-
- return eventLifecycle.removeAndTeardown.apply(this, arguments);
-
- }
+ _eventTeardown: function() {}
});
-eventsProto.on = eventsProto.bind = eventsProto.addEventListener;
-eventsProto.off = eventsProto.unbind = eventsProto.removeEventListener;
delete eventsProto.one;
+delete eventsProto.addEventListener;
+delete eventsProto.removeEventListener;
define.setup = function(props, sealed) {
defineConfigurableAndNotEnumerable(this, "_cid");
@@ -719,6 +677,60 @@ define.setup = function(props, sealed) {
};
define.replaceWith = replaceWith;
define.eventsProto = eventsProto;
+define.mixinEvents = function(objPrototype, makeEnumerable){
+ // Add necessary event methods to this object.
+ for (var prop in eventsProto) {
+ Object.defineProperty(objPrototype, prop, {
+ enumerable: !!makeEnumerable,
+ value: eventsProto[prop],
+ configurable: true,
+ writable: true
+ });
+ }
+
+ var baseAddEventListener = objPrototype.addEventListener ||
+ canEvent.addEventListener;
+ var baseRemoveEventListener = objPrototype.removeEventListener ||
+ canEvent.removeEventListener;
+
+ objPrototype.addEventListener = function(eventName, handler) {
+ var computedBinding = this._computed && this._computed[eventName];
+ if (computedBinding && computedBinding.compute) {
+ if (!computedBinding.count) {
+ computedBinding.count = 1;
+ computedBinding.compute.addEventListener("change", computedBinding.handler);
+ } else {
+ computedBinding.count++;
+ }
+ }
+
+ return baseAddEventListener.apply(this, arguments);
+ };
+
+ // ### unbind
+ // Stops listening to an event.
+ // If this is the last listener of a computed property,
+ // stop forwarding events of the computed property to this map.
+ objPrototype.removeEventListener = function(eventName, handler) {
+ var computedBinding = this._computed && this._computed[eventName];
+ if (computedBinding) {
+ if (computedBinding.count === 1) {
+ computedBinding.count = 0;
+ computedBinding.compute.removeEventListener("change", computedBinding.handler);
+ } else {
+ computedBinding.count--;
+ }
+
+ }
+
+ return baseRemoveEventListener.apply(this, arguments);
+ };
+
+ eventLifecycle(objPrototype);
+
+ objPrototype.on = objPrototype.bind = objPrototype.addEventListener;
+ objPrototype.off = objPrototype.unbind = objPrototype.removeEventListener;
+};
define.defineConfigurableAndNotEnumerable = defineConfigurableAndNotEnumerable;
define.make = make;
define.getDefinitionOrMethod = getDefinitionOrMethod;
diff --git a/define-test.js b/define-test.js
index 872ef37..b295694 100644
--- a/define-test.js
+++ b/define-test.js
@@ -4,6 +4,7 @@ var define = require("can-define");
var stache = require("can-stache");
var CanList = require("can-list");
var canBatch = require("can-event/batch/batch");
+var domDispatch = require("can-util/dom/dispatch/dispatch");
var isArray = require("can-util/js/is-array/is-array");
var each = require("can-util/js/each/each");
var types = require("can-types");
@@ -1504,3 +1505,34 @@ QUnit.test('setter with default value causes an infinite loop (#142)', function(
var a = new A();
QUnit.equal(a.val, 'hello', 'creating an instance should not cause an inifinte loop');
});
+
+QUnit.test('Works with DOM elements', function(){
+ var el = document.createElement('div');
+ define(el, { foo: 'string' });
+
+ var fooCompute = compute(function(){
+ return el.foo;
+ });
+
+ var events = 0;
+ el.addEventListener('foo', function(){
+ events++;
+ });
+
+ el.addEventListener('some-event', function(){
+ events++;
+ });
+
+ fooCompute.on('change', function(){
+ QUnit.ok(true, "change was called");
+ QUnit.start();
+ });
+
+ QUnit.stop();
+
+ el.foo = 'bar';
+ QUnit.equal(events, 1, 'An event occurred');
+
+ domDispatch.call(el, "some-event");
+ QUnit.equal(events, 2, 'Another event');
+});
diff --git a/list/list.js b/list/list.js
index 1bb9728..db92c7a 100644
--- a/list/list.js
+++ b/list/list.js
@@ -1056,14 +1056,8 @@ assign(DefineList.prototype, {
// Add necessary event methods to this object.
-for (var prop in define.eventsProto) {
- DefineList[prop] = define.eventsProto[prop];
- Object.defineProperty(DefineList.prototype, prop, {
- enumerable: false,
- value: define.eventsProto[prop],
- writable: true
- });
-}
+define.mixinEvents(DefineList, true);
+define.mixinEvents(DefineList.prototype);
Object.defineProperty(DefineList.prototype, "length", {
get: function() {
diff --git a/map/map.js b/map/map.js
index cf8f618..79cee87 100644
--- a/map/map.js
+++ b/map/map.js
@@ -56,7 +56,7 @@ var setProps = function(props, remove) {
}
else if( ("replace" in curVal) && isArray(newVal)) {
curVal.replace(newVal);
- }
+ }
else if( ("set" in curVal) && (isPlainObject(newVal) || isArray(newVal))) {
curVal.set(newVal, remove);
}
@@ -259,14 +259,9 @@ var DefineMap = Construct.extend("DefineMap",{
});
// Add necessary event methods to this object.
-for(var prop in define.eventsProto) {
- DefineMap[prop] = define.eventsProto[prop];
- Object.defineProperty(DefineMap.prototype, prop, {
- enumerable:false,
- value: define.eventsProto[prop],
- writable: true
- });
-}
+define.mixinEvents(DefineMap, true);
+define.mixinEvents(DefineMap.prototype);
+
types.DefineMap = DefineMap;
types.DefaultMap = DefineMap;
diff --git a/package.json b/package.json
index 32ad2d2..97e9474 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"can-cid": "^1.0.0",
"can-compute": "^3.0.0",
"can-construct": "^3.0.6",
- "can-event": "^3.0.1",
+ "can-event": "^3.1.0",
"can-namespace": "^1.0.0",
"can-observation": "^3.0.1",
"can-types": "^1.0.1",