Merge pull request #148 from canjs/major

Merge major branch for 6.0 release

Author: matthewp

.travis.yml

@@ -5,7 +5,7 @@ before_script:
   - sleep 2
 script: npm run ci
 addons:
-  firefox: '53.0'
+  firefox: latest
   sauce_connect: true
 dist: xenial
 services:

can-view-live.js

@@ -1,10 +1,10 @@
 "use strict";
-var live = require("./lib/core");
-require("./lib/attr");
-require("./lib/attrs");
-require("./lib/html");
-require("./lib/list");
-require("./lib/text");
+var live = {};
+live.attr = require("./lib/attr");
+live.attrs = require("./lib/attrs");
+live.html = require("./lib/html");
+live.list = require("./lib/list");
+live.text = require("./lib/text");
 
 
 module.exports = live;

lib/attr.js

@@ -1,8 +1,7 @@
 "use strict";
-var live = require('./core');
 var canReflect = require('can-reflect');
-var queues = require("can-queues");
 var attr = require("can-attribute-observable/behaviors");
+var helpers = require('./helpers');
 
 /**
  * @function can-view-live.attr attr
@@ -29,31 +28,21 @@ var attr = require("can-attribute-observable/behaviors");
  * This listens for the changes in the observable and uses those changes to
  * set the specified attribute.
  */
-live.attr = function(el, attributeName, compute) {
-	function liveUpdateAttr(newVal) {
-		queues.domUIQueue.enqueue(attr.set, attr, [el, attributeName, newVal]);
-	}
+module.exports = function(el, attributeName, compute) {
+	var handlerName = "";
 	//!steal-remove-start
 	if(process.env.NODE_ENV !== 'production') {
 		// register that the handler changes the parent element
-		canReflect.assignSymbols(liveUpdateAttr, {
-			"can.getChangesDependencyRecord": function() {
-				var s = new Set();
-				s.add(el);
-				return {
-					valueDependencies: s
-				};
-			}
-		});
-		Object.defineProperty(liveUpdateAttr, "name", {
-			value: "live.attr update::"+canReflect.getName(compute),
-		});
+		handlerName = "live.attr update::"+canReflect.getName(compute);
 	}
 	//!steal-remove-end
 
-	// Bind a single attribute on an element to a compute
-	live.listen(el, compute, liveUpdateAttr);
-
-	// do initial set of attribute as well
-	attr.set(el, attributeName, canReflect.getValue(compute));
+	new helpers.ListenUntilRemovedAndInitialize(compute,
+			function liveUpdateAttr(newVal) {
+				attr.set(el,attributeName, newVal);
+			},
+			el,
+			"dom",
+			handlerName
+		);
 };

lib/attrs.js

@@ -1,111 +1,72 @@
 "use strict";
 // This provides live binding for stache attributes.
-var live = require('./core');
 var viewCallbacks = require('can-view-callbacks');
-var domMutate = require('can-dom-mutate');
 var domMutateNode = require('can-dom-mutate/node');
 var canReflect = require('can-reflect');
-var canReflectDeps = require('can-reflect-dependencies');
 
-live.attrs = function(el, compute, scope, options) {
+var helpers = require('./helpers');
 
+module.exports = function(el, compute, scope, options) {
+	var handlerName = "";
 	if (!canReflect.isObservableLike(compute)) {
 		// Non-live case (`compute` was not a compute):
 		//  set all attributes on the element and don't
 		//  worry about setting up live binding since there
 		//  is not compute to bind on.
-		var attrs = live.getAttributeParts(compute);
+		var attrs = helpers.getAttributeParts(compute);
 		for (var name in attrs) {
 			domMutateNode.setAttribute.call(el, name, attrs[name]);
 		}
 		return;
 	}
 
-	// last set of attributes
-	var oldAttrs = {};
-
-	// set up a callback for handling changes when the compute
-	// changes
-	function liveAttrsUpdate(newVal) {
-		var newAttrs = live.getAttributeParts(newVal),
-			name;
-		for (name in newAttrs) {
-			var newValue = newAttrs[name],
-				// `oldAttrs` was set on the last run of setAttrs in this context
-				//  (for this element and compute)
-				oldValue = oldAttrs[name];
-			// Only fire a callback
-			//  if the value of the attribute has changed
-			if (newValue !== oldValue) {
-				// set on DOM attributes (dispatches an "attributes" event as well)
-				domMutateNode.setAttribute.call(el, name, newValue);
-				// get registered callback for attribute name and fire
-				var callback = viewCallbacks.attr(name);
-				if (callback) {
-					callback(el, {
-						attributeName: name,
-						scope: scope,
-						options: options
-					});
-				}
-			}
-			// remove key found in new attrs from old attrs
-			delete oldAttrs[name];
-		}
-		// any attrs left at this point are not set on the element now,
-		// so remove them.
-		for (name in oldAttrs) {
-			domMutateNode.removeAttribute.call(el, name);
-		}
-		oldAttrs = newAttrs;
-	}
-
 	//!steal-remove-start
 	if(process.env.NODE_ENV !== 'production') {
-		// register that the handler changes the parent element
-		canReflect.assignSymbols(liveAttrsUpdate, {
-			"can.getChangesDependencyRecord": function() {
-				var s = new Set();
-				s.add(el);
-				return {
-					valueDependencies: s
-				};
-			}
-		});
-
-		Object.defineProperty(liveAttrsUpdate, "name", {
-			value: "live.attrs update::"+canReflect.getName(compute),
-		});
-		canReflectDeps.addMutatedBy(el, compute);
+		handlerName = "live.attrs update::"+canReflect.getName(compute);
 	}
 	//!steal-remove-end
 
-	// set attributes on any change to the compute
-	canReflect.onValue(compute, liveAttrsUpdate,"domUI");
 
-	var removalDisposal;
-	var teardownHandler = function() {
-		canReflect.offValue(compute, liveAttrsUpdate,"domUI");
-		if (removalDisposal) {
-			removalDisposal();
-			removalDisposal = undefined;
-		}
+	// last set of attributes
+	var oldAttrs = {};
 
-		//!steal-remove-start
-		if(process.env.NODE_ENV !== 'production') {
-			canReflectDeps.deleteMutatedBy(el, compute);
-		}
-		//!steal-remove-end
-	};
-	// unbind on element removal
-	removalDisposal = domMutate.onNodeRemoval(el, function () {
-		var doc = el.ownerDocument;
-		var ownerNode = doc.contains ? doc : doc.documentElement;
-		if (!ownerNode.contains(el)) {
-			teardownHandler();
-		}
-	});
 
-	// set up a current attribute set and assign to oldAttrs
-	liveAttrsUpdate(canReflect.getValue(compute));
+	new helpers.ListenUntilRemovedAndInitialize(compute,
+		function canViewLive_updateAttributes(newVal) {
+			var newAttrs = helpers.getAttributeParts(newVal),
+				name;
+			for (name in newAttrs) {
+				var newValue = newAttrs[name],
+					// `oldAttrs` was set on the last run of setAttrs in this context
+					//  (for this element and compute)
+					oldValue = oldAttrs[name];
+				// Only fire a callback
+				//  if the value of the attribute has changed
+				if (newValue !== oldValue) {
+					// set on DOM attributes (dispatches an "attributes" event as well)
+					domMutateNode.setAttribute.call(el, name, newValue);
+					// get registered callback for attribute name and fire
+					var callback = viewCallbacks.attr(name);
+					if (callback) {
+						callback(el, {
+							attributeName: name,
+							scope: scope,
+							options: options
+						});
+					}
+				}
+				// remove key found in new attrs from old attrs
+				delete oldAttrs[name];
+			}
+			// any attrs left at this point are not set on the element now,
+			// so remove them.
+			for (name in oldAttrs) {
+				domMutateNode.removeAttribute.call(el, name);
+			}
+			oldAttrs = newAttrs;
+		},
+		el,
+		"dom",
+		handlerName);
+
 };