Merge branch 'magneto' into major

Author: chasenlehara

lib/attr.js

@@ -1,6 +1,7 @@
-var attr = require('can-util/dom/attr/attr');
 var live = require('./core');
 var canReflect = require('can-reflect');
+var domMutateNode = require('can-dom-mutate/node');
+
 /**
  * @function can-view-live.attr attr
  * @parent can-view-live
@@ -28,7 +29,7 @@ var canReflect = require('can-reflect');
  */
 live.attr = function(el, attributeName, compute) {
 	function liveUpdateAttr(newVal) {
-		attr.set(el, attributeName, newVal);
+		domMutateNode.setAttribute.call(el, attributeName, newVal);
 	}
 	//!steal-remove-start
 	Object.defineProperty(liveUpdateAttr, "name", {

lib/attrs.js

@@ -1,8 +1,8 @@
 // This provides live binding for stache attributes.
 var live = require('./core');
 var viewCallbacks = require('can-view-callbacks');
-var attr = require('can-util/dom/attr/attr');
-var domEvents = require('can-util/dom/events/events');
+var domMutate = require('can-dom-mutate');
+var domMutateNode = require('can-dom-mutate/node');
 var canReflect = require('can-reflect');
 var canReflectDeps = require('can-reflect-dependencies');
 
@@ -15,7 +15,7 @@ live.attrs = function(el, compute, scope, options) {
 		//  is not compute to bind on.
 		var attrs = live.getAttributeParts(compute);
 		for (var name in attrs) {
-			attr.set(el, name, attrs[name]);
+			domMutateNode.setAttribute.call(el, name, attrs[name]);
 		}
 		return;
 	}
@@ -37,7 +37,7 @@ live.attrs = function(el, compute, scope, options) {
 			//  if the value of the attribute has changed
 			if (newValue !== oldValue) {
 				// set on DOM attributes (dispatches an "attributes" event as well)
-				attr.set(el, name, newValue);
+				domMutateNode.setAttribute.call(el, name, newValue);
 				// get registered callback for attribute name and fire
 				var callback = viewCallbacks.attr(name);
 				if (callback) {
@@ -54,7 +54,7 @@ live.attrs = function(el, compute, scope, options) {
 		// any attrs left at this point are not set on the element now,
 		// so remove them.
 		for (name in oldAttrs) {
-			attr.remove(el, name);
+			domMutateNode.removeAttribute.call(el, name);
 		}
 		oldAttrs = newAttrs;
 	}
@@ -69,16 +69,24 @@ live.attrs = function(el, compute, scope, options) {
 	// set attributes on any change to the compute
 	canReflect.onValue(compute, liveAttrsUpdate);
 
+	var removalDisposal;
 	var teardownHandler = function() {
 		canReflect.offValue(compute, liveAttrsUpdate);
-		domEvents.removeEventListener.call(el, 'removed', teardownHandler);
+		if (removalDisposal) {
+			removalDisposal();
+			removalDisposal = undefined;
+		}
 
 		//!steal-remove-start
 		canReflectDeps.deleteMutatedBy(el, compute);
 		//!steal-remove-end
 	};
 	// unbind on element removal
-	domEvents.addEventListener.call(el, 'removed', teardownHandler);
+	removalDisposal = domMutate.onNodeRemoval(el, function () {
+		if (!el.ownerDocument.contains(el)) {
+			teardownHandler();
+		}
+	});
 
 	// set up a current attribute set and assign to oldAttrs
 	liveAttrsUpdate(canReflect.getValue(compute));

lib/core.js

@@ -1,13 +1,11 @@
 var parser = require('can-view-parser');
-var domEvents = require('can-util/dom/events/events');
+var domMutate = require('can-dom-mutate');
 var nodeLists = require('can-view-nodelist');
 var makeFrag = require('can-util/dom/frag/frag');
 var childNodes = require('can-util/dom/child-nodes/child-nodes');
 var canReflect = require('can-reflect');
 var canReflectDeps = require('can-reflect-dependencies');
 
-require('can-util/dom/events/removed/removed');
-
 /**
  * @module {{}} can-view-live can-view-live
  * @parent can-views
@@ -45,14 +43,18 @@ var live = {
 		// Setup a live listener on an element that binds now,
 		//  but unbinds when an element is no longer in the DOM
 		var tornDown = false,
+			removalDisposal,
 			data,
 			teardown = function() {
 				// Removing an element can call teardown which
 				// unregister the nodeList which calls teardown
 				if (!tornDown) {
 					tornDown = true;
 					unbind(data);
-					domEvents.removeEventListener.call(el, 'removed', teardown);
+					if (removalDisposal) {
+						removalDisposal();
+						removalDisposal = undefined;
+					}
 				}
 				return true;
 			};
@@ -61,7 +63,11 @@ var live = {
 				return parent ? false : teardown();
 			}
 		};
-		domEvents.addEventListener.call(el, 'removed', teardown);
+		removalDisposal = domMutate.onNodeRemoval(el, function () {
+			if (!el.ownerDocument.contains(el)) {
+				teardown();
+			}
+		});
 		bind(data);
 		return data;
 	},

lib/list.js

@@ -3,8 +3,8 @@ var live = require('./core');
 var nodeLists = require('can-view-nodelist');
 
 var frag = require('can-util/dom/frag/frag');
-var domMutate = require('can-util/dom/mutate/mutate');
 var childNodes = require('can-util/dom/child-nodes/child-nodes');
+var domMutateNode = require('can-dom-mutate/node');
 
 var makeArray = require('can-util/js/make-array/make-array');
 var each = require('can-util/js/each/each');
@@ -215,7 +215,7 @@ ListDOMPatcher.prototype = {
 		} else {
 			// Add elements before the next index's first element.
 			var el = nodeLists.first(masterNodeList[masterListIndex]);
-			domMutate.insertBefore.call(el.parentNode, frag, el);
+			domMutateNode.insertBefore.call(el.parentNode, frag, el);
 		}
 		splice.apply(this.masterNodeList, [
 			masterListIndex,

package.json

@@ -47,17 +47,18 @@
     ]
   },
   "dependencies": {
+    "can-dom-mutate": "<2.0.0",
     "can-observation": "^4.0.0-pre.3",
     "can-queues": "<2.0.0",
     "can-reflect": "^1.10.2",
     "can-reflect-dependencies": "<2.0.0",
     "can-simple-observable": "^2.0.0-pre.3",
     "can-symbol": "^1.4.1",
     "can-util": "^3.9.6",
-    "can-view-callbacks": "^4.0.0-pre.1",
-    "can-view-nodelist": "^4.0.0-pre.1",
+    "can-view-callbacks": "^4.0.0-pre.9",
+    "can-view-nodelist": "^4.0.0-pre.5",
     "can-view-parser": "^4.0.0-pre.0",
-    "can-view-target": "^3.1.0"
+    "can-view-target": "^4.0.0-pre.1"
   },
   "devDependencies": {
     "can-define": "^2.0.0-pre.7",

test/attr-test.js

@@ -2,8 +2,8 @@ var live = require('can-view-live');
 var Observation = require("can-observation");
 var QUnit = require('steal-qunit');
 var domAttr = require("can-util/dom/attr/attr");
+var domMutate = require('can-dom-mutate');
 var SimpleObservable = require("can-simple-observable");
-var domEvents = require('can-util/dom/events/events');
 var testHelpers = require('can-test-helpers');
 var canReflectDeps = require('can-reflect-dependencies');
 
@@ -79,8 +79,8 @@ testHelpers.dev.devOnlyTest('can-reflect-dependencies', function(assert) {
 		'should return the two SimpleObservable as dependencies'
 	);
 
-	domEvents.addEventListener.call(div, 'removed', function checkTeardown() {
-		domEvents.removeEventListener.call(div, 'removed', checkTeardown);
+	var undo = domMutate.onNodeRemoval(div, function checkTeardown () {
+		undo();
 
 		assert.equal(
 			typeof canReflectDeps.getDependencyDataOf(div),

test/attrs-test.js

@@ -3,8 +3,8 @@ var Observation = require("can-observation");
 var QUnit = require('steal-qunit');
 var SimpleObservable = require("can-simple-observable");
 var queues = require("can-queues");
-var domEvents = require('can-util/dom/events/events');
-var domMutate = require('can-util/dom/mutate/mutate');
+var domMutate = require('can-dom-mutate');
+var domMutateNode = require('can-dom-mutate/node');
 var testHelpers = require('can-test-helpers');
 var canReflectDeps = require('can-reflect-dependencies');
 
@@ -37,30 +37,27 @@ QUnit.test('basics', function () {
 	equal(div.getAttribute('foo'), 'bar');
 });
 
-QUnit.test('should remove `removed` events listener', function () {
-	QUnit.stop();
-	var origAddEventListener = domEvents.addEventListener;
-	var origRemoveEventListener = domEvents.removeEventListener;
-
-	domEvents.addEventListener = function () {
-		QUnit.ok(true, 'addEventListener called');
-		origAddEventListener.apply(this, arguments);
-		domEvents.addEventListener = origAddEventListener;
-	};
-
-	domEvents.removeEventListener = function () {
-		QUnit.ok(true, 'addEventListener called');
-		origRemoveEventListener.apply(this, arguments);
-		domEvents.removeEventListener = origRemoveEventListener;
-		QUnit.start();
+QUnit.test('should remove `removed` events listener', function (assert) {
+	var done = assert.async();
+	var onNodeRemoval = domMutate.onNodeRemoval;
+
+	domMutate.onNodeRemoval = function () {
+		assert.ok(true, 'addEventListener called');
+		var disposal = onNodeRemoval.apply(null, arguments);
+		domMutate.onNodeRemoval = onNodeRemoval;
+		return function () {
+			assert.ok(true, 'disposal function was called');
+			disposal();
+			done();
+		};
 	};
 
 	var div = document.createElement('div');
 	var text = new SimpleObservable('hello');
 
-	domMutate.appendChild.call(this.fixture, div);
+	domMutateNode.appendChild.call(this.fixture, div);
 	live.attrs(div, text);
-	domMutate.removeChild.call(this.fixture, div);
+	domMutateNode.removeChild.call(this.fixture, div);
 });
 
 testHelpers.dev.devOnlyTest('can-reflect-dependencies', function(assert) {
@@ -92,8 +89,8 @@ testHelpers.dev.devOnlyTest('can-reflect-dependencies', function(assert) {
 		new Set([text])
 	);
 
-	domEvents.addEventListener.call(div, 'removed', function checkTeardown() {
-		domEvents.removeEventListener.call(div, 'removed', checkTeardown);
+	var undo = domMutate.onNodeRemoval(div, function checkTeardown () {
+		undo();
 
 		assert.equal(
 			typeof canReflectDeps.getDependencyDataOf(div),

test/list-test.js

@@ -8,9 +8,9 @@ var canReflect = require("can-reflect");
 var queues = require("can-queues");
 var fragment = require('can-util/dom/fragment/fragment');
 var NodeLists = require("can-view-nodelist");
-var domMutate = require('can-util/dom/mutate/mutate');
+var domMutate = require('can-dom-mutate');
+var domMutateNode = require('can-dom-mutate/node');
 var canSymbol = require("can-symbol");
-var domEvents = require('can-util/dom/events/events');
 var testHelpers = require('can-test-helpers');
 var canReflectDeps = require('can-reflect-dependencies');
 
@@ -366,7 +366,7 @@ test("no memory leaks", function () {
 
 	QUnit.stop();
 	setTimeout(function(){
-		domMutate.removeChild.call(fixture,div);
+		domMutateNode.removeChild.call(fixture,div);
 		setTimeout(function () {
 			var handlers = map[canSymbol.for("can.meta")].handlers.get([]);
 			equal(handlers.length, 0, "there are no bindings");
@@ -400,8 +400,8 @@ testHelpers.dev.devOnlyTest('can-reflect-dependencies', function(assert) {
 		new Set([list])
 	);
 
-	domEvents.addEventListener.call(div, 'removed', function checkTeardown() {
-		domEvents.removeEventListener.call(div, 'removed', checkTeardown);
+	var undo = domMutate.onNodeRemoval(div, function checkTeardown () {
+		undo();
 
 		assert.equal(
 			typeof canReflectDeps.getDependencyDataOf(div),