@litejs/ui 21.3.1 → 21.11.0

package/index.js

@@ -1,5 +1,5 @@
 /*
-* @version  21.3.1
+* @version  21.11.0
 * @author   Lauri Rooden <lauri@rooden.ee>
 * @license  MIT License
 */
@@ -731,12 +731,13 @@
 		/*** PUSH ***/
 		}
 		/**/
-		checkUrl()
+		return checkUrl()
 	}
 
 	function checkUrl() {
-		if (lastRoute != (lastRoute = getUrl()) && cb) {
-			cb(lastRoute)
+		if (lastRoute != (lastRoute = getUrl())) {
+			if (cb) cb(lastRoute)
+			return true
 		}
 	}
 
@@ -805,13 +806,14 @@
 
 
 !function(exports) {
-	var fn, lastView, lastParams, lastStr, lastUrl, syncResume
+	var fn, lastView, lastStr, lastUrl, syncResume
 	, isArray = Array.isArray
 	, capture = 1
 	, fnStr = ""
 	, reStr = ""
 	, views = View.views = {}
 	, paramCb = {}
+	, lastParams = paramCb
 	, hasOwn = views.hasOwnProperty
 	, escapeRe = /[.*+?^=!:${}()|\[\]\/\\]/g
 	, parseRe = /\{([\w%.]+?)\}|.[^{\\]*?/g
@@ -899,6 +901,10 @@
 							view.wait(tmp.file = null)
 						)
 					} else {
+						if (tmp.route == "404") {
+							El.txt(tmp = El("h3"), "# Error 404")
+							View("404", tmp, "#body")
+						}
 						View("404").show({origin:params})
 					}
 					return
@@ -986,7 +992,7 @@
 				"return function(i,o,d){var m=r.exec(i);return m!==null?(" + fnStr + "d):d}"
 			)()
 		}
-		return View(fn(url || View.home, params || {}, "404"))
+		return View(url ? fn(url, params || {}, "404") : View.home)
 	}
 
 	View.ping = function(name, fn) {
@@ -1052,9 +1058,8 @@
 /* litejs.com/MIT-LICENSE.txt */
 
 
-
 !function(window, document, Object, Event, protoStr) {
-	var styleNode
+	var UNDEF, styleNode
 	, BIND_ATTR = "data-bind"
 	, isArray = Array.isArray
 	, seq = 0
@@ -1065,13 +1070,13 @@
 	, body = document.body
 	, root = document.documentElement
 	, txtAttr = El.T = "textContent" in body ? "textContent" : "innerText"
-	, templateRe = /^([ \t]*)(%?)((?:("|')(?:\\?.)*?\4|[-\w:.#[\]]=?)*)[ \t]*([>^;@|\\\/]|!?=|)(([\])}]?).*?([[({]?))$/gm
+	, templateRe = /([ \t]*)(%?)((?:("|')(?:\\?.)*?\4|[-\w:.#[\]]=?)*)[ \t]*([>^;@|\\\/]|!?=|)(([\])}]?).*?([[({]?))(?=\x1f+|\n+|$)/g
 	, renderRe = /[;\s]*(\w+)(?:\s*(:?):((?:(["'\/])(?:\\?.)*?\3|[^;])*))?/g
 	, selectorRe = /([.#:[])([-\w]+)(?:\((.+?)\)|([~^$*|]?)=(("|')(?:\\?.)*?\6|[-\w]+))?]?/g
 	, splitRe = /[,\s]+/
 	, camelRe = /\-([a-z])/g
 	, bindings = El.bindings = {
-		attr: setAttr,
+		attr: El.attr = acceptMany(setAttr, getAttr),
 		cls: El.cls = acceptMany(cls),
 		css: El.css = acceptMany(function(el, key, val) {
 			el.style[key.replace(camelRe, camelFn)] = "" + val || ""
@@ -1147,6 +1152,10 @@
 	 * <input id="12" class="nice class" type="checkbox" checked="checked" disabled="disabled" data-lang="en">
 	 */
 
+	function isObject(obj) {
+		return obj && obj.constructor === Object
+	}
+
 	window.El = El
 
 	function El(name) {
@@ -1204,10 +1213,6 @@
 		return a.toUpperCase()
 	}
 
-	El.attr = function(el, key, val) {
-		return arguments.length < 3 && key.constructor != Object ? getAttr(el, key) : setAttr(el, key, val)
-	}
-
 	function getAttr(el, key) {
 		return el && el.getAttribute && el.getAttribute(key)
 	}
@@ -1215,7 +1220,7 @@
 	function setAttr(el, key, val) {
 		var current
 
-		if (key && key.constructor == Object) {
+		if (isObject(key)) {
 			for (current in key) {
 				setAttr(el, current, key[current])
 			}
@@ -1286,7 +1291,7 @@
 
 			for (; input = el.elements[i++]; ) if (!input.disabled && (key = input.name || input.id)) {
 				value = valFn(input)
-				if (value !== void 0) {
+				if (value !== UNDEF) {
 					step = opts
 					key.replace(/\[(.*?)\]/g, function(_, _key, offset) {
 						if (step == opts) key = key.slice(0, offset)
@@ -1329,8 +1334,8 @@
 		}
 
 		return checkbox && !el.checked ?
-		(type === "radio" ? void 0 : null) :
-		el.valObject !== void 0 ? el.valObject : el.value
+		(type === "radio" ? UNDEF : null) :
+		el.valObject !== UNDEF ? el.valObject : el.value
 	}
 
 	function append(el, child, before) {
@@ -1387,10 +1392,16 @@
 	function acceptMany(fn, getter) {
 		return function f(el, name, val, delay) {
 			if (el && name) {
-				if (delay > 0) return setTimeout(f, delay, el, name, val)
-				if (name.constructor === Object) {
+				if (delay >= 0) {
+					if (delay > 0) setTimeout(f, delay, el, name, val)
+					else requestAnimationFrame(function() {
+						f(el, name, val)
+					})
+					return
+				}
+				if (isObject(name)) {
 					for (i in name) {
-						if (hasOwn.call(name, i)) f(el, i, name[i])
+						if (hasOwn.call(name, i)) f(el, i, name[i], val)
 					}
 					return
 				}
@@ -1477,7 +1488,7 @@
 		var fn = fixFn[ev] && fixFn[ev](el, _fn, ev) || _fn
 		, fix = prefix ? function() {
 			var e = new Event(ev)
-			if (e.clientX !== void 0) {
+			if (e.clientX !== UNDEF) {
 				e.pageX = e.clientX + scrollLeft()
 				e.pageY = e.clientY + scrollTop()
 			}
@@ -1527,7 +1538,10 @@
 				selector = null
 			}
 		}
-		if (delay > 0) return setTimeout(bindingOn, delay, el, events, selector, data, handler)
+		if (delay > 0) {
+			setTimeout(bindingOn, delay, el, events, selector, data, handler)
+			return
+		}
 		var fn = (
 			typeof handler == "string" ? function(e) {
 				var target = selector ? El.closest(e.target, selector) : el
@@ -1565,15 +1579,19 @@
 	}
 
 	function empty(el) {
-		for (var node; node = el.firstChild; ) {
-			kill(node)
-		}
+		for (var node; node = el.firstChild; kill(node));
 		return el
 	}
 
-	function kill(el) {
+	function kill(el, tr, delay) {
 		var id
 		if (el) {
+			if (delay > 0) return setTimeout(kill, delay, el, tr)
+			if (tr) {
+				cls(el, tr, tr = "transitionend")
+				// transitionend fires for each property transitioned
+				if ("on" + tr in el) return addEvent(el, tr, kill.bind(el, el, el = null))
+			}
 			if (el._e) {
 				emitter.emit.call(el, "kill")
 				for (id in el._e) rmEvent(el, id)
@@ -1585,11 +1603,11 @@
 				return el.kill && el.kill()
 			}
 			empty(el)
-			if (id = el._scope) {
-				delete elScope[id]
+			if (el._scope !== UNDEF) {
+				delete elScope[el._scope]
 			}
-			if (el.valObject) {
-				el.valObject = null
+			if (el.valObject !== UNDEF) {
+				el.valObject = UNDEF
 			}
 		}
 	}
@@ -1628,14 +1646,14 @@
 
 			fn = "data b s B r->data&&(" + bind.replace(renderRe, function(match, name, op, args) {
 				scope._m[i] = match
-				var fn = bindings[name]
+				match = bindings[name]
 				return (
-					(op == ":" || fn && hasOwn.call(fn, "once")) ?
+					(op == ":" || match && hasOwn.call(match, "once")) ?
 					"s(this,B,data._t=data._t.replace(data._m[" + (i++)+ "],''))||" :
 					""
 				) + (
-					fn ?
-					"b['" + name + "'].call(data,this" + (fn.raw ? ",'" + args + "'" : args ? "," + args : "") :
+					match ?
+					"b['" + name + "'].call(data,this" + (match.raw ? ",'" + args + "'" : args ? "," + args : "") :
 					"s(this,'" + name + "'," + args
 				) + ")||"
 			}) + "r)"
@@ -1698,10 +1716,10 @@
 	}
 
 	wrapProto.cloneNode = function(deep) {
-		var clone = new ElWrap(this, deep)
-		clone._ca = this._ca
-		//clone._cb = this._cb
-		return clone
+		deep = new ElWrap(this, deep)
+		deep._ca = this._ca
+		//deep._cb = this._cb
+		return deep
 	}
 
 	El.append = append
@@ -1843,10 +1861,7 @@
 
 				JSON.parse(this.params)
 				.each(function(val) {
-					if (!val || val.constructor != Object) {
-						val = { item: val }
-					}
-					parseTemplate(txt.format(val))
+					parseTemplate(txt.format(isObject(val) ? val : { item: val }))
 				})
 			}
 		}),
@@ -1919,7 +1934,7 @@
 	/*** kb ***/
 	var kbMaps = []
 	, kbMod = El.kbMod = iOS ? "metaKey" : "ctrlKey"
-	, kbKeys = {
+	, kbMap = El.kbMap = {
 		  8: "backspace", 9: "tab",
 		 13: "enter",    16: "shift", 17: "ctrl",  18: "alt",  19: "pause",
 		 20: "caps",     27: "esc",
@@ -1952,7 +1967,7 @@
 			var c = e.keyCode || e.which
 			, numpad = c > 95 && c < 106
 			, code = numpad ? c - 48 : c
-			, key = kbKeys[code] || String.fromCharCode(code).toLowerCase() || code
+			, key = kbMap[code] || String.fromCharCode(code).toLowerCase() || code
 
 			// Otherwise IE backspace navigates back
 			if (code == 8 && kbMaps[0].backspace) {
@@ -1976,15 +1991,14 @@
 		if (map) {
 			kbMaps.unshift(map)
 			if (killEl) {
-				// addEvent(killEl, "kill", rmKb.bind(map, map))
 				emitter.on.call(killEl, "kill", rmKb.bind(map, map))
 			}
 		}
 	}
 	El.rmKb = rmKb
 	function rmKb(map) {
-		var i = kbMaps.indexOf(map||kbMaps[0])
-		if (i > -1) kbMaps.splice(i, 1)
+		map = kbMaps.indexOf(map || kbMaps[0])
+		if (map > -1) kbMaps.splice(map, 1)
 	}
 
 	addEvent(document, "keydown", kbDown)
@@ -2035,277 +2049,4 @@
 	addEvent(window, "orientationchange", setBreakpointsRated)
 	addEvent(window, "load", setBreakpointsRated)
 	/**/
-}(window, document, Object, Event, "prototype")
-/* litejs.com/MIT-LICENSE.txt */
-
-
-
-!function(bindings) {
-	var hasOwn = Object.prototype.hasOwnProperty
-	, slice = Array.prototype.slice
-
-	fixReadonlyCheckbox.once =
-	bindingEvery.once =
-	emitForm.once =
-	bindingFn.once =
-	bindingsEach.raw = bindingsEach.once =
-	true
-
-	bindings.every = bindingEvery
-	function bindingEvery(el, list, attrName) {
-		var len = 0
-		, data = this
-		, parent = el.parentNode
-		, comm = document.createComment("every " + (list.name || list.length))
-		, nodes = []
-
-		parent.replaceChild(comm, el)
-
-		if (list) {
-			if (typeof list === "string") {
-				data.model.on("change:" + list, render)
-				El.on(parent, "kill", function() {
-					data.model.off("change:" + list, render)
-				})
-				render()
-			} else if (list.eachLive) {
-				list.eachLive(add, remove, list)
-				El.on(parent, "kill", function() {
-					list.off("add", add, list).off("remove", remove, list)
-				})
-			} else {
-				comm.render = render
-				render()
-			}
-		}
-		return true
-
-		function render() {
-			for (; len; len--) {
-				remove(len)
-			}
-			_list = typeof list === "string" ? data.model.get(list, []) : list
-			if (typeof _list === "string") _list.split(",")
-			Object.each(_list, add, (
-				_list.constructor === Object ? Object.keys(_list) : _list
-			))
-		}
-
-		function add(item, i) {
-			len++
-			var up
-			, clone = el.cloneNode(true)
-			, scope = El.scope(clone, data)
-			, before = nodes[i] || comm
-			if (!before.parentNode) return
-			nodes.splice(i, 0, clone)
-			scope.i = i
-			scope._scope = scope
-			scope.len = this.length
-			scope[attrName || "item"] = item
-			El.append(before.parentNode, clone, before)
-			El.render(clone, scope)
-			if (typeof item.on === "function") {
-				item.on("change", up = El.render.bind(clone, clone))
-				El.on(clone, "kill", function() {
-					item.off("change", up)
-				})
-			}
-		}
-
-		function remove(item, i) {
-			El.kill(nodes.splice(i, 1)[0])
-		}
-	}
-
-	bindings.fixReadonlyCheckbox = fixReadonlyCheckbox
-	function fixReadonlyCheckbox(el) {
-		El.on(el, "click pointerdown", function(e) {
-			if ((this.firstChild || this).readOnly) {
-				return Event.stop(e)
-			}
-		})
-	}
-
-	bindings.fn = bindingFn
-	function bindingFn(el, fn) {
-		return fn.apply(el, slice.call(arguments, 3))
-	}
-
-	bindings["if"] = bindingsIf
-	function bindingsIf(el, enabled) {
-		var parent = el.parentNode
-		, scope = this
-		if (enabled) {
-			parent || el._ifComm && el._ifComm.parentNode.replaceChild(el, el._ifComm)
-		} else {
-			if (parent) {
-				if (!el._ifComm) {
-					El.on(el, "kill", El.kill.bind(el, el._ifComm = document.createComment("if")))
-					el._ifComm.render = function() {
-						El.render(el, scope)
-					}
-				}
-				parent.replaceChild(el._ifComm, el)
-			}
-			return true
-		}
-	}
-
-	bindings.is = function bindingIs(node, model, path, list, state) {
-		var match
-		, scope = this
-		if (typeof model === "string") {
-			state = list
-			list = path
-			path = model
-			model = scope.model
-		}
-		if (model && path) {
-			match = i18n.pick(state != null ? state : model.get(path), list)
-			El.cls(node, scope["_is-" + path], 0)
-			El.cls(node, scope["_is-" + path] = match && "is-" + match)
-		}
-	}
-
-	bindings.emitForm = emitForm
-	function emitForm(el, ev, a1, a2, a3, a4) {
-		El.on(el, "submit", function(e) {
-			var data = El.val(el)
-			View.emit(ev, e, data, a1, a2, a3, a4)
-			return Event.stop(e)
-		})
-	}
-
-	function getChilds(node) {
-		var child
-		, childs = node._childs
-		if (!childs) {
-			for (node._childs = childs = []; child = node.firstChild;) {
-				childs.push(child);
-				node.removeChild(child)
-			}
-		}
-		return childs
-	}
-
-	bindings.each = bindingsEach
-
-	function bindingsEach(el, expr) {
-		var node = el
-		, child = getChilds(node)[0]
-		, match = /^\s*(\w+) in (\w*)(.*)/.exec(expr)
-		, fn = "with(data){var out=[],loop={i:0,offset:0},_1,_2=" + match[2]
-		+ match[3].replace(/ (limit|offset):\s*(\d+)/ig, ";loop.$1=$2")
-		+ ";if(_2)for(_1 in _2)if(hasOwn.call(_2,_1)&&!(loop.offset&&loop.offset--)){"
-		+     "loop.i++;"
-		+     "if(loop.limit&&loop.i-loop.offset>loop.limit)break;"
-		+     "var clone=el.cloneNode(true)"
-		+     ",scope=El.scope(clone,data);"
-		+     "scope.loopKey=loop.key=_1;"
-		+     "scope.loop=loop;"
-		+     "scope." + match[1] + "=_2[_1];"
-		+     "out.push(clone);"
-		+ "};return out}"
-
-		var childs = Function("hasOwn,el,data", fn)(hasOwn, child, this)
-
-		El.append(El.empty(node), childs)
-		El.render(node)
-		return node
-	}
-
-	bindings.focus = function(el) {
-		el.focus()
-	}
-
-	bindings.href = function(el, url) {
-		if (url) {
-			var chr = url.charAt(0)
-			El.attr(el, "href", chr === "+" || chr === "%" ? "#" + View.expand(url) : url)
-		}
-	}
-}(El.bindings)
-/* litejs.com/MIT-LICENSE.txt */
-
-
-
-El.bindings.list = function(node, list, extra, val) {
-	var child = node._child
-	, data = this
-	, extraLen = 0
-
-	if (!child) {
-		child = node._child = node.removeChild(node.firstChild)
-	}
-
-	if (!list || node._list == list) return
-
-	if (node._list) clear()
-
-	node._list = data.list = list
-
-	El.on(node, "kill", clear)
-
-	El.cls(node, "loading")
-
-	if (extra) {
-		extra.each(clone)
-		extraLen = extra.length
-	}
-
-	list
-	.each(clone)
-	.on("add", clone).on("remove", remove)
-	.on("startLoading", function(){
-		El.cls(node, "loading")
-	})
-	.on("endLoading", function(){
-		El.cls(node, "loading", 0)
-	})
-	.then(function() {
-		if (val !== void 0 && El.val(node) !== val) {
-			if (!this.get(val)) {
-				clone({id:val,name:val}, extraLen)
-				extraLen++
-			}
-			El.val(node, val)
-		}
-		El.cls(node, "loading", 0)
-	})
-
-	// Do not render childs when list initialized
-	return true
-
-	function clone(item, pos) {
-		var clone = child.cloneNode(true)
-		, scope = El.scope(clone, data)
-		scope.item = item.data || item || {id:item,name:item}
-		scope.model = item
-		scope.pos = pos
-		function up() {
-			El.render(clone, scope)
-		}
-		if (item.on) {
-			item.on("change", up)
-			El.on(clone, "kill", function(){
-				item.off("change", up)
-			})
-		}
-		El.append(node, clone, extraLen + pos)
-		return El.render(clone, scope)
-	}
-
-	function remove(item, pos) {
-		El.kill(node.childNodes[extraLen + pos])
-	}
-
-	function clear() {
-		var list = node._list
-		El.empty(node)
-		if (list) {
-			node._list = null
-			list.off("add", clone).off("remove", remove)
-		}
-	}
-}
+}(window, document, Object, Event, "prototype")

package/load.js

@@ -24,7 +24,7 @@
 // XDomainRequest is a CORS implementation in IE8/9 and was removed in IE10 in favor of using XMLHttpRequest with proper CORS
 // IE does not allow to add arbitrary properties to ActiveX objects.
 // IE does not allow to assign or read the readystatechange after the send().
-// Last version-independent ProgID with 3.0 is good enough (MSXML2 is supported from IE4.01).
+// Last version-independent ProgID with 3.0 is good enough (MSXML2 namespace is supported from IE6).
 // MSXML 6.0 has improved XSD, deprecated several legacy features
 // What's New in MSXML 6.0: https://msdn.microsoft.com/en-us/library/ms753751.aspx
 
@@ -32,8 +32,12 @@
 	xhr._s = new Date
 	var loaded = {}
 	, urlEscRe = /[+#\s]+/g
-	, XMLHttpRequest = +"\v1" && window.XMLHttpRequest || Function("return new ActiveXObject('MSXML2.XMLHTTP')")
-	, execScript = window.execScript ||
+	/*** activex ***/
+	, XMLHttpRequest = +"\v1" && window.XMLHttpRequest || Function("return new ActiveXObject('Microsoft.XMLHTTP')")
+	/**/
+	, execScript =
+		// IE5-10, Chrome1-12
+		window.execScript ||
 	/*** inject ***/
 		// THANKS: Juriy Zaytsev - Global eval [http://perfectionkills.com/global-eval-what-are-the-options/]
 		Function("e,eval", "try{return e('eval')==e&&e}catch(e){}")(eval) ||
@@ -49,9 +53,7 @@
 	/*** onerror ***/
 	, lastError
 	, unsentErrors = []
-
-	window.onerror = onerror
-	function onerror(message, file, line, col, error) {
+	, onerror = window.onerror = function(message, file, line, col, error) {
 		// Do not send multiple copies of the same error.
 		// file = document.currentScript.src || import.meta.url
 		if (lastError !== (lastError =
@@ -71,12 +73,14 @@
 	}
 
 	function sendErrors() {
-		if (xhr.logErrors) {
-			xhr.logErrors(unsentErrors)
+		if (xhr.err) {
+			xhr.err(unsentErrors)
 		} else {
 			setTimeout(sendErrors, 1307)
 		}
 	}
+	/*/
+	, onerror = nop
 	/**/
 
 	// next === true is for sync call
@@ -211,6 +215,7 @@
 	/**/
 
 
+	/*** load ***/
 	xhr.load = load
 	function load(files, next) {
 		if (typeof files == "string") files = [files]
@@ -222,6 +227,7 @@
 
 		for (; i < len; i++) if ((file = files[i]) && 2 !== loaded[file]) {
 			if (loaded[file]) {
+				// Same file requested again
 				;(loaded[file].x || (loaded[file].x = [])).push(cb, file, i)
 			} else {
 				// FireFox 3 throws on `xhr.send()` without arguments
@@ -249,6 +255,10 @@
 			}
 			if (res[pos] === "" || !files[pos]) {
 				if (++pos < len) exec()
+				/*** inject ***/
+				// inject can be async
+				else if (pos === len) setTimeout(exec, 1)
+				/**/
 				else {
 					if (next) next()
 					if (res = cb.x) {
@@ -259,7 +269,10 @@
 		}
 	}
 
-	load([/*!{loadFiles}*/])
+	load([
+		//!{loadFiles}
+	])
+	/**/
 
 	function nop() {}
 }(this, Function)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@litejs/ui",
-  "version": "21.3.1",
+  "version": "21.11.0",
   "description": "UI engine for LiteJS full-stack framework",
   "license": "MIT",
   "author": "Lauri Rooden <lauri@rooden.ee>",
@@ -22,9 +22,7 @@
     "css"
   ],
   "litejs": {
-    "build": [
-      "-i test/dev.html -o test/index.html"
-    ]
+    "build": "lj b --out=test/index.html test/dev.html"
   },
   "jshintConfig": {
     "asi": true,
@@ -32,7 +30,7 @@
     "maxdepth": 6,
     "quotmark": "double"
   },
-  "nyc": {
+  "c8": {
     "check-coverage": true,
     "branches": 100,
     "lines": 100,