Merge branch 'master' into minor

lib/core.js

@@ -1,8 +1,8 @@
 var parser = require('can-view-parser');
 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 makeFrag = require('can-fragment');
+var childNodes = require('can-child-nodes');
 var canReflect = require('can-reflect');
 var canReflectDeps = require('can-reflect-dependencies');
 

lib/html.js

@@ -1,8 +1,7 @@
 var live = require('./core');
 var nodeLists = require('can-view-nodelist');
-var makeFrag = require('can-util/dom/frag/frag');
-var makeArray = require('can-util/js/make-array/make-array');
-var childNodes = require('can-util/dom/child-nodes/child-nodes');
+var makeFrag = require('can-fragment');
+var childNodes = require('can-child-nodes');
 var canReflect = require('can-reflect');
 var canSymbol = require("can-symbol");
 var queues = require("can-queues");
@@ -107,7 +106,7 @@ live.html = function(el, compute, parentNode, nodeListOrOptions) {
 		var frag = makeFrag(isFunction ? "" : val);
 
 		// previous set of nodes
-		var oldNodes = makeArray(nodes);
+		var oldNodes = canReflect.toArray(nodes);
 
 		// Add a placeholder textNode if necessary.
 		live.addTextNodeIfNoChildren(frag);

lib/list.js

@@ -2,15 +2,14 @@ var live = require('./core');
 
 var nodeLists = require('can-view-nodelist');
 
-var frag = require('can-util/dom/frag/frag');
-var childNodes = require('can-util/dom/child-nodes/child-nodes');
+var frag = require('can-fragment');
+var childNodes = require('can-child-nodes');
 var domMutateNode = require('can-dom-mutate/node');
+var canReflect = require("can-reflect");
 
-var makeArray = require('can-util/js/make-array/make-array');
-var each = require('can-util/js/each/each');
 
 var canSymbol = require("can-symbol");
-var canReflect = require("can-reflect");
+
 var canReflectDeps = require("can-reflect-dependencies");
 
 var SimpleObservable = require("can-simple-observable");
@@ -39,7 +38,7 @@ var renderAndAddToNodeLists = function(newNodeLists, parentNodeList, render, con
 			itemFrag = frag(itemHTML);
 
 		// get all the direct children of the frag
-		var children = makeArray(childNodes(itemFrag));
+		var children = canReflect.toArray(childNodes(itemFrag));
 		if (parentNodeList) {
 			// if a parent list was supplied, children of the frag become the
 			//  child nodeList items.
@@ -58,7 +57,7 @@ var renderAndAddToNodeLists = function(newNodeLists, parentNodeList, render, con
 	removeFromNodeList = function(masterNodeList, index, length) {
 		var removedMappings = masterNodeList.splice(index + 1, length),
 			itemsToRemove = [];
-		each(removedMappings, function(nodeList) {
+		removedMappings.forEach( function(nodeList) {
 
 			// Unregister to free up event bindings.
 			var nodesToRemove = nodeLists.unregister(nodeList);
@@ -185,7 +184,7 @@ ListDOMPatcher.prototype = {
 			render = this.render,
 			context = this.context;
 		// For each new item,
-		each(items, function(item, key) {
+		items.forEach( function(item, key) {
 
 			var itemIndex = new SimpleObservable(key + index),
 				itemCompute = new SetObservable(item, function(newVal) {

lib/patcher.js

@@ -1,7 +1,7 @@
 var canReflect = require("can-reflect");
 var KeyTree = require("can-key-tree");
 var canSymbol = require("can-symbol");
-var diff = require('can-util/js/diff/diff');
+var diff = require('can-diff/list/list');
 var queues = require("can-queues");
 var canSymbol = require("can-symbol");
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "can-view-live",
-  "version": "4.1.0-pre.1",
+  "version": "4.2.0-pre.0",
   "description": "",
   "homepage": "https://canjs.com/doc/can-view-live.html",
   "repository": {
@@ -47,15 +47,17 @@
     ]
   },
   "dependencies": {
-    "can-attribute-observable": "^0.2.1",
+    "can-attribute-observable": "<2.0.0",
+    "can-child-nodes": "^1.0.0",
+    "can-diff": "^1.0.1",
     "can-dom-mutate": "^1.0.0",
+    "can-fragment": "^1.0.0",
     "can-observation": "^4.0.0",
     "can-queues": "^1.0.0",
     "can-reflect": "^1.10.2",
     "can-reflect-dependencies": "^1.0.0",
     "can-simple-observable": "^2.0.0",
     "can-symbol": "^1.4.1",
-    "can-util": "^3.9.6",
     "can-view-callbacks": "^4.0.0",
     "can-view-nodelist": "^4.0.0",
     "can-view-parser": "^4.0.0",
@@ -71,6 +73,6 @@
     "steal": "^1.2.10",
     "steal-qunit": "^1.0.1",
     "test-saucelabs": "0.0.3",
-    "testee": "^0.7.0"
+    "testee": "^0.8.0"
   }
 }

test/list-test.js

@@ -6,7 +6,7 @@ var SimpleObservable = require("can-simple-observable");
 var SimpleMap = require("can-simple-map");
 var canReflect = require("can-reflect");
 var queues = require("can-queues");
-var fragment = require('can-util/dom/fragment/fragment');
+var fragment = require('can-fragment');
 var NodeLists = require("can-view-nodelist");
 var domMutate = require('can-dom-mutate');
 var domMutateNode = require('can-dom-mutate/node');

test/live-test.js

@@ -5,15 +5,14 @@ var List = require('can-list');
 var nodeLists = require('can-view-nodelist');
 var canBatch = require('can-event/batch/batch');
 var Observation = require("can-observation");
+var canReflect = require("can-reflect");
 
 var QUnit = require('steal-qunit');
 
 var domMutate = require('can-dom-mutate');
 var domMutateNode = require('can-dom-mutate/node');
 
-var domAttr = require("can-util/dom/attr/attr");
-var fragment = require('can-util/dom/fragment/fragment');
-var makeArray = require('can-util/js/make-array/make-array');
+var fragment = require('can-fragment');
 
 QUnit.module('can-view-live',{
 	setup: function(){
@@ -322,7 +321,7 @@ test("can.live.attr works with non-string attributes (#1790)", function() {
 			return 2;
 		});
 
-	domAttr.set(el, "value", 1);
+	domMutateNode.setAttribute(el, "value", 1);
 	live.attr(el, 'value', attrCompute);
 	ok(true, 'No exception thrown.');
 });
@@ -463,10 +462,10 @@ test('changing items in a live.list after it has been unregistered works (#55)',
 	});
 
 	// set up nodelists
-	var htmlNodeList = makeArray(fragment("<div></div>").childNodes);
+	var htmlNodeList = canReflect.toArray(fragment("<div></div>").childNodes);
 	nodeLists.register(htmlNodeList, function(){}, true);
 
-	var listNodeList = makeArray(fragment("<div></div>").childNodes);
+	var listNodeList = canReflect.toArray(fragment("<div></div>").childNodes);
 	nodeLists.register(listNodeList, function(){}, htmlNodeList, true);
 
 	// set up elements
@@ -634,4 +633,3 @@ QUnit.test("events are torn down from correct list on change", function() {
 	ok(!list.__bindEvents.add || list.__bindEvents.add.length === 0, "Add handler has been removed from list");
 	ok(filteredList.__bindEvents.add && filteredList.__bindEvents.add.length > 0, "Add handler has been added to filteredList");
 });
-