@litejs/ui 24.11.0 → 25.5.0

package/shim.js

@@ -17,11 +17,12 @@
 /* c8 ignore start */
 !function(window, Date, Function, Infinity, P) {
 
-	// Array#flat()         - Chrome69, Edge79, Firefox62, Safari12
-	// window.PointerEvent  - Chrome55, Edge12, Firefox59, Safari13,   IE11
-	// navigator.sendBeacon - Chrome39, Edge14, Firefox31, Safari11.1
-	// Object.fromEntries   - Chrome73, Edge79, Firefox63, Safari12.1, Opera60, Node.js12.0.0
-	// queueMicrotask       - Chrome71, Edge79, Firefox69, Safari12.1
+	// Array#flat()         - Chrome69, Firefox62, Safari12
+	// window.PointerEvent  - Chrome55, Firefox59, Safari13,   IE11
+	// navigator.sendBeacon - Chrome39, Firefox31, Safari11.1
+	// Object.fromEntries   - Chrome73, Firefox63, Safari12.1, Opera60, Node.js12.0.0
+	// queueMicrotask       - Chrome71, Firefox69, Safari12.1
+	// "".at(), [].at()     - Chrome92, Firefox90, Safari15.4
 
 	var UNDEF, isArray, oKeys
 	, O = window
@@ -35,7 +36,7 @@
 	, IS_NODE = !window.document
 	, document = patch("document", {body:{},documentElement:{}})
 	, location = patch("location", {href:""})
-	, navigator = patch("navigator")
+	, navigator = patch("navigator", {})
 	/*/
 	, document = window.document
 	, IS_NODE = false
@@ -384,8 +385,11 @@
 	patch("flatMap",     "return X.apply(t,A).flat()", 0, O.map)
 	//patch("entries", "a=this;b=-1;return{next:function(){c=a.length<=++b;return{done:c,value:c?void 0:a[b]}}}")
 
+	a = "b=t.length;a=a<0?b+a|0:a|0;return a>=b||a<0?X:t"
+	patch("at",          a + "[a]")
 
 	O = String[P]
+	patch("at",          a + ".charAt(a)")
 	patch("endsWith", "return(a+='')===t.slice(-a.length)")
 	patch("startsWith", "return t.lastIndexOf(a,0)===0")
 	patch("trim", "return t.replace(/^\\s+|\\s+$/g,'')")
@@ -522,7 +526,6 @@
 		return !force && O[key] || (O[patched.push(key_), key] = (
 			isStr(src) ?
 			Function("o,O,P,S,F,X,Y", "return function(a,b,c){var t=this,A=arguments;" + src + "}")(hasOwn, O[key], P, patched.slice, force, arg1, arg2) :
-			src === UNDEF ? {} :
 			src
 		))
 	}

package/ui.js

@@ -1,7 +1,7 @@
 
 /* litejs.com/MIT-LICENSE.txt */
 
-/* global escape, navigator, xhr */
+/* global escape, navigator, xhr, addEventListener */
 
 /*** debug ***/
 console.log("LiteJS is in debug mode, but it's fine for production")
@@ -11,8 +11,10 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	window.El = El
 	asEmitter(window.LiteJS = LiteJS)
 
-	var UNDEF, lastExp, parser, pushBase, styleNode
+	var UNDEF, parser, pushBase, styleNode, canCapture
 	, NUL = null
+	// THIS will be undefined in strict mode and window in sloppy mode
+	, THIS = this
 	, html = document.documentElement
 	, body = document.body
 	, splitRe = /[,\s]+/
@@ -34,13 +36,10 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	// http://webreflection.blogspot.com/2009/01/32-bytes-to-know-if-your-browser-is-ie.html
 	, ie678 = !+"\v1" // jshint ignore:line
 
-	, BIND_ATTR = "data-bind"
 	, elSeq = 0
 	, elCache = {}
-	, formatRe = /{((?:("|')(?:\\.|[^\\])*?\2|.)+?)}/g
-	, renderRe = /[;\s]*([-.\w$]+)(?:([ :!])((?:(["'\/])(?:\\.|[^\\])*?\4|[^;])*))?/g
+	, renderRe = /[;\s]*([-.\w$]+)(?:(!?)[ :]*((?:(["'\/])(?:\\.|[^\\])*?\4|[^;])*))?/g
 	, selectorRe = /([.#:[])([-\w]+)(?:([~^$*|]?)=(("|')(?:\\.|[^\\])*?\5|[-\w]+))?]?/g
-	, templateRe = /([ \t]*)(%?)((?:("|')(?:\\.|[^\\])*?\4|[-\w:.#[\]~^$*|]=?)*) ?([\/>+=@^;]|)(([\])}]?).*?([[({]?))(?=\x1f|\n|$)+/g
 	, fnCache = {}
 	, fnRe = /('|")(?:\\.|[^\\])*?\1|\/(?:\\.|[^\\])+?\/[gim]*|\$el\b|\$[aos]\b|\b(?:false|in|if|new|null|this|true|typeof|void|function|var|else|return)\b|\.\w+|\w+:/g
 	, wordRe = /[a-z_$][\w$]*/ig
@@ -56,8 +55,8 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			var target = selector ? closest(e.target, selector) : el
 			if (target) emit.apply(target, [elScope(el).$ui, val, e, target].concat(data))
 		} :
-		selector ? function(e, a1, a2) {
-			if (matches(e.target, selector)) val(e, a1, a2)
+		selector ? function(e, touchEv, touchEl) {
+			if (matches(touchEl = e.target, selector)) val(e, touchEv, touchEl, data)
 		} :
 		val
 	})
@@ -68,10 +67,8 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		set: acceptMany(setAttr),
 		txt: elTxt,
 		val: elVal,
-		view: function(el, url) {
-			setAttr(el, "href", (pushBase || "#") + expand(url || ""))
-		}
 	}
+	, bindOnce = []
 	, globalScope = {
 		El: El,
 		$b: bindings
@@ -152,7 +149,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		el.setAttributeNS("http://www.w3.org/1999/xlink", "xlink:href", href)
 	}
 	if (window.SVGElement) {
-		each("animate animateMotion animateTransform circle clipPath defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feDropShadow feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter foreignObject g image line linearGradient marker mask metadata mpath path pattern polygon polyline radialGradient rect script set stop svg switch symbol text textPath tspan use view", function(name) {
+		each("animate animateMotion animateTransform circle clipPath defs ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feDropShadow feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence g image line linearGradient marker mask mpath path pattern polygon polyline radialGradient rect set stop svg text textPath tspan use", function(name) {
 			elCache[name] = document.createElementNS("http://www.w3.org/2000/svg", name)
 		})
 		// a style title
@@ -165,7 +162,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	}
 
 	function asEmitter(obj) {
-		obj.on = on
+		obj.on = wrap(on)
 		obj.off = off
 		obj.one = one
 		obj.emit = wrap(emit)
@@ -177,14 +174,14 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		}
 	}
 
-	function on(type, fn, scope, _origin) {
-		var emitter = this === window ? emptyArr : this
-		, events = emitter._e || (emitter._e = create(NUL))
-		if (type && fn) {
+	function on(emitter, type, fn, scope, _origin) {
+		if (emitter && type && fn) {
+			if (emitter === window) emitter = emptyArr
 			emit(emitter, "newListener", type, fn, scope, _origin)
+			var events = emitter._e || (emitter._e = create(NUL))
 			;(events[type] || (events[type] = [])).unshift(scope, _origin, fn)
 		}
-		return this
+		return emitter
 	}
 
 	function off(type, fn, scope) {
@@ -205,12 +202,13 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 
 	function one(type, fn, scope) {
 		var emitter = this === window ? emptyArr : this
+
 		function remove() {
 			off.call(emitter, type, fn, scope)
 			off.call(emitter, type, remove, scope)
 		}
-		on.call(emitter, type, remove, scope)
-		on.call(emitter, type, fn, scope)
+		on(emitter, type, remove, scope)
+		on(emitter, type, fn, scope)
 		return this
 	}
 
@@ -227,18 +225,24 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		return _e / 3
 	}
 
+	try {
+		addEventListener("t", NUL, { get capture() { canCapture = 1 }})
+	} catch(e){}
+
 	function addEvent(el, ev, fn, opts) {
 		var fn2 = fixFn[ev] && fixFn[ev](el, fn, ev) || fn
 		, ev2 = fixEv[ev] || ev
 
 		if (ev2 !== "" && "on" + ev2 in el) {
 			// polyfilled addEventListener returns patched function
-			// Since Chrome 56 touchstart/move have the { passive: true } by default.
-			// preventDefault() won't work unless you set passive to false.
-			fn2 = html.addEventListener.call(el, ev2, fn2, opts != UNDEF ? opts : false) || fn2
+			// useCapture defaults to false
+			// Chrome56 touchstart/move sets {passive:true} by default; use {passive:false} to enable preventDefault()
+			fn2 = html.addEventListener.call(
+				el, ev2, fn2, !canCapture && isObj(opts) ? !!opts.capture : opts || false
+			) || fn2
 		}
 
-		on.call(el, ev, fn2, el, fn)
+		on(el, ev, fn2, el, fn)
 	}
 
 	function rmEvent(el, ev, fn) {
@@ -287,7 +291,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				return view
 			}
 			view = this
-			if (!(view instanceof View)) return new View(route, el, parent)
+			if (view === THIS) return new View(route, el, parent)
 			views[view.r = route] = view
 			view.e = isStr(el) ? find(html, el) : el
 			view.p = parent && View(parent)
@@ -346,7 +350,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			},
 			parse: (parser = viewParse),
 			ping: function(view, fn) {
-				View(view).on("ping", fn)
+				on(View(view), "ping", fn)
 			},
 			show: viewShow
 		})
@@ -374,7 +378,9 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				render(view.o)
 				viewEmit(parent, "openChild", view, close)
 				viewEmit(view, "open", params)
+				/*** kb ***/
 				addKb(view.kb)
+				/**/
 				params._c = UNDEF
 			}
 			if ((params._d = params._v = view.c)) {
@@ -392,7 +398,9 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				viewClose(view.c)
 				elKill(view.o)
 				view.o = UNDEF
+				/*** kb ***/
 				rmKb(view.kb)
+				/**/
 				viewEmit(view, "close")
 			}
 		}
@@ -432,6 +440,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			var parent = El("div")
 			, stack = [-1]
 			, parentStack = []
+			, templateRe = /([ \t]*)(%?)((?:("|')(?:\\.|[^\\])*?\4|[-\w:.#[\]~^$*|]=?)*) ?([\/>=@^;]|)(([\])}]?).*?([[({]?))(?=\x1f|$)/gm
 
 			function work(all, indent, plugin, sel, q, op, text, mapEnd, mapStart, offset) {
 				if (offset && all === indent) return
@@ -466,8 +475,8 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 						append(parent, parent = El(sel))
 					}
 					if (text && op != "/") {
-						if (op === ">" || op === "+") {
-							replace(indent + (op === "+" ? text : " " + text), templateRe, work)
+						if (op === ">") {
+							replace(indent + " " + text, templateRe, work)
 						} else if (op === "=") {
 							append(parent, text) // + "\n")
 						} else {
@@ -539,7 +548,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			var params = $d.params = { _t: Date.now() }
 			, view = viewGet(url, params)
 			if (!view.o || lastUrl !== url) {
-				$d.url = lastExp = lastUrl = url
+				$d.url = lastUrl = expand(url)
 				viewPing(view, params)
 			}
 		}
@@ -628,7 +637,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		addPlugin("view", {
 			c: 1,
 			d: function(plugin) {
-				var expr = getAttr(plugin.e, BIND_ATTR)
+				var expr = getAttr(plugin.e, "_b")
 				, view = View(plugin.n, usePluginContent(plugin), plugin.x)
 				if (expr) {
 					viewEval(replace(expr, renderRe, function(_, name, op, args) {
@@ -739,7 +748,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 						values.push(a)
 						return "#"
 					})
-					return str != key && t[key] ? replace(t[key], /#/g, bind(values.shift, values)) : str
+					return str != key ? replace(iGet(t, key, str), /#/g, bind(values.shift, values)) : str
 				},
 				pick: function(val, word) {
 					for (var t = translations["?"] || {}, arr = replace((t[word] || word), /([^;=,]+?)\?/g, "$1=$1;").split(/[;=,]/), i = 1|arr.length; i > 0; ) {
@@ -896,17 +905,35 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			}
 		})
 		function format(str, data, getter) {
-			return replace(str, formatRe, function(all, path) {
-				return getter(data, path, "")
-			})
+			for (var char, inQuote, inExpr, depth = 0, pos = 0, len = str.length; pos < len; ) {
+				char = str.charAt(pos++)
+				if (char == "'" || char == "\"") { // '"
+					inQuote = (!inExpr || char === inQuote) ? "" : char
+				} else if (inQuote) {
+					if (char == "\\") pos++
+				} else if (char == "{" && depth++ < 1) {
+					inExpr = pos
+				} else if (char == "}" && inExpr && --depth < 1) {
+					char = getter(data, str.slice(inExpr, pos - 1), "")
+					str = str.slice(0, inExpr - 1) + char + str.slice(pos)
+					pos = inExpr + char.length - 1
+					len = str.length
+				}
+			}
+			return str
 		}
-		function iGet(obj, path, fallback) {
+		function iGet(obj, path, fallback, tmp) {
 			return isStr(path) ? (
 				isStr(obj[path]) ? obj[path] :
+				isStr(obj[tmp = path.toLowerCase()]) ? (
+					path.slice(1) === tmp.slice(1) ? obj[tmp].charAt(0).toUpperCase() + obj[tmp].slice(1) :
+					path === tmp.toUpperCase() ? obj[tmp].toUpperCase() :
+					obj[tmp]
+				) :
 				(path = path.split("."))[1] && isObj(obj = obj[path[0]]) && isStr(obj[path[1]]) ? obj[path[1]] :
 				fallback
 			) :
-			isArr(path) ? iGet(obj, path[0]) || iGet(obj, path[1]) || iGet(obj, path[2], fallback) :
+			isArr(path) ? iGet(obj, path[0], tmp) || iGet(obj, path[1], tmp) || iGet(obj, path[2], fallback) :
 			fallback
 		}
 		/*/
@@ -1065,7 +1092,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 					subScope.$i = pos++
 					subScope.$len = list.length
 					subScope[name] = item
-					clone[BIND_ATTR] = el[BIND_ATTR]
+					clone._b = el._b
 					/*** debug ***/
 					clone._li = up
 					/**/
@@ -1081,7 +1108,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				tag = elCache[tag] ? tag : fallback
 				if (el._el !== tag) {
 					var child = El(tag)
-					, tmp = child._elb = el._el ? el._elb : el[BIND_ATTR]
+					, tmp = child._elb = el._el ? el._elb : el._b
 					if (tmp) appendBind(child, tmp, ";", "^")
 					child.$s = el.$s
 					child._el = tag
@@ -1093,29 +1120,35 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			},
 			"if": function(el, enabled) {
 				if (enabled) {
-					elReplace(el._if, el)
+					elReplace(el._r, el)
 				} else {
-					elReplace(el, el._if || (el._if = Comm("if", bind(render, el, el, this))))
+					elReplace(el, el._r || (el._r = Comm("if", bind(render, el, el, this))))
 					return true
 				}
 			},
 			is: function(el, val, opts, prefix) {
-				if (!prefix) prefix = "is-"
+				if (!isStr(prefix)) prefix = "is-"
 				var match = elScope(el)._.ext.pick(val, opts)
 				cls(el, el[prefix + opts], 0)
 				cls(el, el[prefix + opts] = match && prefix + match)
 			},
+			name: function(el, name) {
+				setAttr(el, "name", expand(name, 1))
+			},
 			ref: function(el, name) {
 				this[name] = el
 			},
 			$s: function(el) {
-				var scope = elScope(el, el)
+				var scope = this
 				each(slice.call(arguments, 1), function(args) {
 					each(args, function(arg, i) {
 						if (isStr(i)) scope[i] = arg
 						else scope[arg] = setAttr(el, arg, "")
 					})
 				})
+			},
+			view: function(el, url) {
+				setAttr(el, "href", (pushBase || "#") + expand(url || ""))
 			}
 		}),
 		$d: globalScope,
@@ -1128,8 +1161,6 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		hasClass: hasClass,
 		matches: matches,
 		nearest: nearest,
-		next: bind(walk, El, "nextSibling"),
-		prev: bind(walk, El, "previousSibling"),
 		rate: rate,
 		replace: elReplace,
 		scope: elScope,
@@ -1210,8 +1241,8 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	}
 
 	function appendBind(el, val, sep, q) {
-		var current = getAttr(el, BIND_ATTR)
-		setAttr(el, BIND_ATTR, (current ? (
+		var current = getAttr(el, "_b")
+		setAttr(el, "_b", (current ? (
 			q === "^" ?
 			val + sep + current :
 			current + sep + val
@@ -1277,6 +1308,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			elRm(el)
 			if (el.nodeType < 2) {
 				el.$s = UNDEF
+				elKill(el._r) // Replacement element like comment from if binding
 				elEmpty(el)
 				if (el.valObject !== UNDEF) {
 					el.valObject = UNDEF
@@ -1385,7 +1417,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		}
 		/**/
 
-		if (hydrate(node, BIND_ATTR, scope)) return
+		if (hydrate(node, "_b", scope)) return
 		for (el = node.firstChild; el; el = next) {
 			next = el.nextSibling
 			render(el, scope)
@@ -1398,20 +1430,16 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		, expr = node[attr] || (node[attr] = setAttr(node, attr, "") || true)
 		if (expr !== true) try {
 			fn = fnCache[expr] || (fnCache[expr] = makeFn(expr))
-			return fn(node, scope, attr, fn.o)
+			return fn(node, scope, attr, bindOnce)
 		} catch (e) {
 			throw e + "\n" + attr + ": " + expr
 		}
 	}
-	function makeFn(fn, raw) {
-		var i = 0
-		, bindOnce = []
+	function makeFn(fn, raw, i) {
 		fn = raw || "$s&&(" + replace(fn, renderRe, function(match, name, op, args) {
 			return (
-				(op === "!" && (bindOnce[i] = match)) ?
-				"($el[$a]=$el[$a].replace($o[" + (i++)+ "],''),0)||" :
-				""
-			) + "$b['" + (bindings[name] ? name + "'].call($s,$el" : "set']($el,'" + name + "'") + (args ? "," + replace(args, /^\s*(\w+) in /,"'$1',") : "") + ")||"
+				op ? "($el[$a]=$el[$a].replace($o[" + (i = bindOnce.indexOf(match), i < 0 ? bindOnce.push(match) - 1 : i)+ "],''),0)||" : ""
+			) + "$b['" + (bindings[name] ? name + "'].call($s" + (name == "$s" ? "=El.scope($el,$el)": "") + ",$el" : "set']($el,'" + name + "'") + (args ? "," + args : "") + ")||"
 		}) + "$r)"
 		var vars = replace(fn, fnRe, "").match(wordRe) || []
 		for (i = vars.length; i--; ) {
@@ -1419,7 +1447,6 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			else vars[i] += "=$s." + vars[i]
 		}
 		fn = Function("$el,$s,$a,$o,$r", (vars[0] ? "var " + vars : "") + ";return " + fn)
-		fn.o = bindOnce
 		return fn
 	}
 
@@ -1488,8 +1515,8 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	, touches = []
 	, touchEv = {}
 
-	// tap, swipe + left/right/up/down
-	each("pan pinch rotate tap", function(name) {
+	// swipe + left/right/up/down
+	each("hold pan pinch rotate tap", function(name) {
 		fixEv[name] = fixEv[name + START] = fixEv[name + END] = ""
 		fixFn[name] = touchInit
 	})
@@ -1509,7 +1536,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				emit(touchEl, touchMode ? touchMode + END : "tap", e2, touchEv, touchEl)
 				touchMode = UNDEF
 			}
-			if (len < 0) {
+			if (len < 1) {
 				touchEl = UNDEF
 			}
 			if (len === 1) {
@@ -1520,7 +1547,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 					touchPos("left", "offsetWidth")
 					touchPos("top", "offsetHeight")
 					if (e.button === 2 || matches(touchEl, "INPUT,TEXTAREA,SELECT,.no-drag")) return
-					touchTick = setTimeout(moveOne, 1500, e, 1)
+					touchTick = setTimeout(moveOne, LiteJS.holdDelay || 800, e, 1)
 				}
 				moveOne(e || touches[0])
 			}
@@ -1554,8 +1581,9 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 		function touchWheel(e) {
 			// IE10 enabled pinch-to-zoom gestures from multi-touch trackpad’s as mousewheel event with ctrlKey.
 			// Chrome M35 and Firefox 55 followed up.
+			// alt+wheel may be OS level zoom, use shiftKey as alternative
 			if (!touches[0]) {
-				var ev = e.ctrlKey ? "pinch" : e.altKey ? "rotate" : UNDEF
+				var ev = e.ctrlKey ? "pinch" : e.altKey || e.shiftKey ? "rotate" : UNDEF
 				if (ev && emit(e.currentTarget || e.target, ev, e, e.deltaY/20, 0)) {
 					return eventStop(e)
 				}
@@ -1623,23 +1651,16 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	function nearest(el, sel) {
 		return el ? find(el, sel) || nearest(el.parentNode, sel) : NUL
 	}
-	function walk(attr, el, sel) {
-		for (; el && !matches(el = el[attr], sel); );
-		return el
-	}
 	function acceptMany(fn, prepareVal) {
 		return function f(el, name, val, selector, delay, data) {
 			if (el && name) {
-				var i = arguments.length
-				if (i > 3 && i < 6) {
-					if (isArr(selector)) {
-						data = selector
-						delay = selector = UNDEF
-					} else if (isNum(selector)) {
-						data = delay
-						delay = selector
-						selector = UNDEF
-					}
+				if (isNum(selector)) {
+					data = delay
+					delay = selector
+					selector = UNDEF
+				} else if (isArr(selector) || isObj(selector)) {
+					data = selector
+					delay = selector = UNDEF
 				}
 				if (delay > 0) {
 					setTimeout(f, delay, el, name, val, selector, 0, data)
@@ -1647,16 +1668,15 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 				}
 				if (isObj(name)) {
 					for (delay in name) if (hasOwn(name, delay)) {
-						f(el, delay, name[delay], selector, 0, data)
+						f(el, delay, name[delay], val, 0, data)
 					}
 					return
 				}
 				if (prepareVal) val = prepareVal(el, val, selector, data)
 				selector = !prepareVal && selector ? findAll(el, selector) : isArr(el) ? el : [ el ]
-				var arr = ("" + name).split(splitRe), len = arr.length
 				for (delay = 0; (el = selector[delay++]); ) {
-					for (i = 0; i < len; ) {
-						if (arr[i]) fn(el, arr[i++], isArr(val) ? val[i - 1] : val)
+					for (var arr = ("" + name).split(splitRe), i = 0, len = arr.length; i < len; ) {
+						if (arr[i]) fn(el, arr[i++], isArr(val) ? val[i - 1] : val, data)
 					}
 				}
 			}
@@ -1672,9 +1692,7 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 	function blur() {
 		// IE8 can throw on accessing document.activeElement.
 		try {
-			var el = document.activeElement
-			, tag = el.tagName
-			if (tag === "A" || tag === "BUTTON") el.blur()
+			document.activeElement.blur()
 		} catch(e) {}
 	}
 	function camelFn(_, a) {
@@ -1687,13 +1705,14 @@ console.log("LiteJS is in debug mode, but it's fine for production")
 			else for (key in arr) if (hasOwn(arr, key)) fn.call(scope, arr[key], key, arr)
 		}
 	}
-	function expand(str) {
+	function expand(str, ns) {
 		var first = str.charAt(0)
 		, rest = str.slice(1)
+		, lastExp = expand[ns]
 		return (
 			first === "+" ? lastExp + rest :
 			first === "%" ? ((first = lastExp.lastIndexOf(rest.charAt(0))), (first > 0 ? lastExp.slice(0, first) : lastExp)) + rest :
-			(lastExp = str)
+			(expand[ns] = str)
 		)
 	}
 	function injectCss(cssText) {