diff --git a/bundler/bundler.js b/bundler/bundler.js
index 6c6009db..c551649a 100644
--- a/bundler/bundler.js
+++ b/bundler/bundler.js
@@ -35,4 +35,4 @@ function resolve(dir, data) {
return data
}
-fs.writeFileSync("mithril.min.js", resolve(".", fs.readFileSync("index.js", "utf8")), "utf8")
+fs.writeFileSync("mithril.js", resolve(".", fs.readFileSync("index.js", "utf8")), "utf8")
diff --git a/examples/threaditjs-bundle/app.js b/examples/threaditjs-bundle/app.js
new file mode 100644
index 00000000..a2a4963f
--- /dev/null
+++ b/examples/threaditjs-bundle/app.js
@@ -0,0 +1,181 @@
+T.time("Setup");
+
+var m = require("../../mithril")
+var request = m.request
+
+//API calls
+var api = {
+ home : function() {
+ T.timeEnd("Setup")
+ return request({method: "GET", url: T.apiUrl + "/threads/"})
+ },
+ thread : function(id) {
+ T.timeEnd("Setup")
+ return request({method: "GET", url: T.apiUrl + "/comments/" + id}).then(T.transformResponse)
+ },
+ newThread : function(text) {
+ return request({method: "POST", url: T.apiUrl + "/threads/create",data: {text: text}})
+ },
+ newComment : function(text, id) {
+ return request({method: "POST", url: T.apiUrl + "/comments/create", data: {text: text, parent: id}});
+ }
+};
+
+var threads = [], current = null, loaded = false, error = false, notFound = false
+function loadThreads() {
+ loaded = false
+ api.home().then(function(response) {
+ document.title = "ThreaditJS: Mithril | Home"
+ threads = response.data
+ loaded = true
+ }, function() {
+ loaded = error = true
+ })
+ .then(m.redraw)
+}
+
+function loadThread(id) {
+ loaded = false
+ notFound = false
+ api.thread(id).then(function(response) {
+ document.title = "ThreaditJS: Mithril | " + T.trimTitle(response.root.text);
+ loaded = true
+ current = response
+ }, function(response) {
+ loaded = true
+ if (response.status === 404) notFound = true
+ else error = true
+ })
+ .then(m.redraw)
+}
+function unloadThread() {
+ current = null
+}
+
+function createThread() {
+ var threadText = document.getElementById("threadText")
+ api.newThread(threadText.value).then(function(response) {
+ threadText.value = "";
+ threads.push(response.data);
+ })
+ .then(m.redraw)
+ return false
+}
+
+function showReplying(vnode) {
+ vnode.state.replying = true
+ vnode.state.newComment = ""
+ return false
+}
+
+function submitComment(vnode) {
+ api.newComment(vnode.state.newComment, vnode.attrs.node.id).then(function(response) {
+ vnode.state.newComment = ""
+ vnode.state.replying = false
+ vnode.attrs.node.children.push(response.data)
+ })
+ .then(m.redraw)
+ return false
+}
+
+//shared
+var Header = {
+ view: function() {
+ return [
+ m("p.head_links", [
+ m("a[href='https://github.com/koglerjs/threaditjs/tree/master/examples/mithril']", "Source"),
+ " | ",
+ m("a[href='http://threaditjs.com']", "ThreaditJS Home"),
+ ]),
+ m("h2", [
+ m("a[href='/']", {oncreate: m.route.link}, "ThreaditJS: Mithril"),
+ ]),
+ ]
+ }
+}
+
+//home
+var Home = {
+ oninit: loadThreads,
+ view: function() {
+ return [
+ m(Header),
+ m(".main", [
+ loaded === false ? m("h2", "Loading") :
+ error ? m("h2", "Error! Try refreshing.") :
+ notFound ? m("h2", "Not found! Don't try refreshing!") : [
+ threads.map(function(thread) {
+ return [
+ m("p", [
+ m("a", {href: "/thread/" + thread.id, oncreate: m.route.link}, m.trust(T.trimTitle(thread.text))),
+ ]),
+ m("p.comment_count", thread.comment_count + " comment(s)"),
+ m("hr"),
+ ]
+ }),
+ m(NewThread),
+ ]
+ ])
+ ]
+ }
+}
+var NewThread = {
+ view: function() {
+ return m("form", {onsubmit: createThread}, [
+ m("textarea#threadText"),
+ m("input", {type:"submit", value: "Post!"}),
+ ])
+ }
+}
+
+//thread
+var Thread = {
+ oninit: function(vnode) {
+ loadThread(vnode.attrs.id)
+ },
+ onremove: unloadThread,
+ view: function() {
+ if (current) T.time("Thread render")
+ return [
+ m(Header),
+ current ? m(".main", {oncreate: function() {T.timeEnd("Thread render")}}, [
+ m(ThreadNode, {node: current.root})
+ ]) : null
+ ]
+ }
+}
+var ThreadNode = {
+ view: function(vnode) {
+ return m(".comment", [
+ m("p", m.trust(vnode.attrs.node.text)),
+ m(".reply", m(Reply, vnode.attrs)),
+ m(".children", [
+ vnode.attrs.node.children.map(function(child) {
+ return m(ThreadNode, {node: child})
+ })
+ ])
+ ])
+ }
+}
+var Reply = {
+ view: function(vnode) {
+ return vnode.state.replying
+ ? m("form", {onsubmit: function() {return submitComment(vnode)}}, [
+ m("textarea", {
+ value: vnode.state.newComment,
+ oninput: function(e) {
+ vnode.state.newComment = e.target.value
+ },
+ }),
+ m("input", {type:"submit", value: "Reply!"}),
+ m(".preview", m.trust(T.previewComment(vnode.state.newComment))),
+ ])
+ : m("a", {onclick: function() {return showReplying(vnode)}}, "Reply!")
+ }
+}
+
+//router
+m.route(document.getElementById("app"), "/", {
+ "/thread/:id" : Thread,
+ "/" : Home,
+})
diff --git a/examples/threaditjs-bundle/colors.css b/examples/threaditjs-bundle/colors.css
new file mode 100644
index 00000000..e5716963
--- /dev/null
+++ b/examples/threaditjs-bundle/colors.css
@@ -0,0 +1,6 @@
+html {background-color:#f5f5f5;}
+
+a {color:#161;text-decoration:none;}
+a:hover {text-decoration:underline;}
+
+input[type=submit] {background-color:#5A5;color:#fff;border:0;font-weight:bold;}
\ No newline at end of file
diff --git a/examples/threaditjs-bundle/index.html b/examples/threaditjs-bundle/index.html
new file mode 100644
index 00000000..f62da924
--- /dev/null
+++ b/examples/threaditjs-bundle/index.html
@@ -0,0 +1,17 @@
+
+
+
+
+ Mithril • ThreadIt.js
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/examples/threaditjs/app.js b/examples/threaditjs/app.js
index 863001ff..d8cb5b00 100644
--- a/examples/threaditjs/app.js
+++ b/examples/threaditjs/app.js
@@ -1,6 +1,6 @@
T.time("Setup");
-var request = require("../../request/request")(window, Promise, run).ajax
+var request = require("../../request/request")(window, Promise).ajax
var m = require("../../render/hyperscript")
var trust = require("../../render/trust")
var render = require("../../render/render")(window, run).render
@@ -182,11 +182,12 @@ function run() {
replayRoute()
}
+var root = document.getElementById("app")
var replayRoute = router.defineRoutes({
"/thread/:id" : Thread,
"/" : Home
}, function(view, args) {
- render(document.body, [m(view, args)])
+ render(root, [m(view, args)])
}, function() {
router.setPath("/")
})
diff --git a/examples/threaditjs/index.html b/examples/threaditjs/index.html
index 5d6c805e..b59ffea7 100644
--- a/examples/threaditjs/index.html
+++ b/examples/threaditjs/index.html
@@ -8,6 +8,7 @@
+
diff --git a/index.js b/index.js
index 2581d04b..c2bf5b9e 100644
--- a/index.js
+++ b/index.js
@@ -1,8 +1,18 @@
"use strict"
-//TODO expose properly
-var Router = require("./router/router")
-var Request = require("./request/request")
-var Render = require("./render/render")
var m = require("./render/hyperscript")
-var trust = require("./render/trust")
\ No newline at end of file
+var trust = require("./render/trust")
+var createMounter = require("./mount")
+var createRouterInstance = require("./router")
+var createRequester = require("./request/request")
+var redraw = {run: function() {}}
+
+m.redraw = function() {
+ redraw.run()
+}
+m.trust = trust
+m.mount = createMounter(window, redraw)
+m.route = createRouterInstance(window, redraw)
+m.request = createRequester(window, Promise).ajax
+
+module.exports = m
diff --git a/mithril.js b/mithril.js
new file mode 100644
index 00000000..dd2c1d20
--- /dev/null
+++ b/mithril.js
@@ -0,0 +1,885 @@
+"use strict"
+
+function Node(tag, key, attrs, children, text, dom) {
+ return {tag: tag, key: key, attrs: attrs, children: children, text: text, dom: dom, domSize: undefined, state: {}, events: undefined}
+}
+Node.normalize = function(node) {
+ if (node instanceof Array) return Node("[", undefined, undefined, Node.normalizeChildren(node), undefined, undefined)
+ else if (node != null && typeof node !== "object") return Node("#", undefined, undefined, node, undefined, undefined)
+ return node
+}
+Node.normalizeChildren = function normalizeChildren(children) {
+ for (var i = 0; i < children.length; i++) {
+ children[i] = Node.normalize(children[i])
+ }
+ return children
+}
+
+var Node = Node
+
+var selectorParser = /(?:(^|#|\.)([^#\.\[\]]+))|(\[.+?\])/g, attrParser = /\[(.+?)(?:\s*=\s*("|'|)(.*?)\2)?\]/
+var selectorCache = {}
+function hyperscript(selector) {
+ if (typeof selector === "string") {
+ if (selectorCache[selector] === undefined) {
+ var match, tag, id, classes = [], attributes = {}
+ while (match = selectorParser.exec(selector)) {
+ var type = match[1], value = match[2]
+ if (type === "" && value !== "") tag = value
+ else if (type === "#") attributes.id = value
+ else if (type === ".") classes.push(value)
+ else if (match[3][0] === "[") {
+ var pair = attrParser.exec(match[3])
+ attributes[pair[1]] = pair[3] || true
+ }
+ }
+ if (classes.length > 0) attributes.className = classes.join(" ")
+ selectorCache[selector] = function(attrs, children) {
+ var hasAttrs = false, childList, text
+ var className = attrs.className || attrs.class
+ for (var key in attributes) attrs[key] = attributes[key]
+ if (className !== undefined) {
+ if (attrs.class !== undefined) {
+ attrs.class = undefined
+ attrs.className = className
+ }
+ if (attributes.className !== undefined) attrs.className = attributes.className + " " + className
+ }
+ for (var key in attrs) {
+ if (key !== "key") {
+ hasAttrs = true
+ break
+ }
+ }
+ if (children instanceof Array && children.length == 1 && children[0] != null && children[0].tag === "#") text = children[0].children
+ else childList = children
+
+ var vnode = Node(tag || "div", attrs.key, hasAttrs ? attrs : undefined, childList, text, undefined)
+ switch (vnode.tag) {
+ case "svg": changeNS("http://www.w3.org/2000/svg", vnode); break
+ case "math": changeNS("http://www.w3.org/1998/Math/MathML", vnode); break
+ }
+ return vnode
+ }
+ }
+ }
+ var attrs, children, childrenIndex
+ if (arguments[1] == null || typeof arguments[1] === "object" && arguments[1].tag === undefined && !(arguments[1] instanceof Array)) {
+ attrs = arguments[1]
+ childrenIndex = 2
+ }
+ else childrenIndex = 1
+ if (arguments.length === childrenIndex + 1) {
+ children = arguments[childrenIndex] instanceof Array ? arguments[childrenIndex] : [arguments[childrenIndex]]
+ }
+ else {
+ children = []
+ for (var i = childrenIndex; i < arguments.length; i++) children.push(arguments[i])
+ }
+
+ if (typeof selector === "string") return selectorCache[selector](attrs || {}, Node.normalizeChildren(children))
+ return Node(selector, attrs && attrs.key, attrs || {}, Node.normalizeChildren(children), undefined, undefined)
+}
+
+function changeNS(ns, vnode) {
+ vnode.ns = ns
+ if (vnode.children != null) {
+ for (var i = 0; i < vnode.children.length; i++) changeNS(ns, vnode.children[i])
+ }
+}
+
+var m = hyperscript
+
+
+var trust = function(html) {
+ return Node("<", undefined, undefined, html, undefined, undefined)
+}
+
+
+var createRenderer = function($window) {
+ var $doc = $window.document
+
+ var onevent
+ function setEventCallback(callback) {return onevent = callback}
+
+ //create
+ function createNodes(parent, vnodes, start, end, hooks, nextSibling) {
+ for (var i = start; i < end; i++) {
+ var vnode = vnodes[i]
+ if (vnode != null) {
+ insertNode(parent, createNode(vnode, hooks), nextSibling)
+ }
+ }
+ }
+ function createNode(vnode, hooks) {
+ var tag = vnode.tag
+ if (vnode.attrs) {
+ if (vnode.attrs.oninit) vnode.attrs.oninit.call(vnode, vnode)
+ if (vnode.attrs.oncreate) hooks.push(vnode.attrs.oncreate.bind(vnode, vnode))
+ }
+ if (typeof tag === "string") {
+ switch (tag) {
+ case "#": return createText(vnode)
+ case "<": return createHTML(vnode)
+ case "[": return createFragment(vnode, hooks)
+ default: return createElement(vnode, hooks)
+ }
+ }
+ else return createComponent(vnode, hooks)
+ }
+ function createText(vnode) {
+ return vnode.dom = $doc.createTextNode(vnode.children)
+ }
+ function createHTML(vnode) {
+ var match = vnode.children.match(/^\s*?<(\w+)/im) || []
+ var parent = {caption: "table", thead: "table", tbody: "table", tfoot: "table", tr: "tbody", th: "tr", td: "tr", colgroup: "table", col: "colgroup"}[match[1]] || "div"
+ var temp = $doc.createElement(parent)
+
+ temp.innerHTML = vnode.children
+ vnode.dom = temp.firstChild
+ vnode.domSize = temp.childNodes.length
+ var fragment = $doc.createDocumentFragment()
+ var child
+ while (child = temp.firstChild) {
+ fragment.appendChild(child)
+ }
+ return fragment
+ }
+ function createFragment(vnode, hooks) {
+ var fragment = $doc.createDocumentFragment()
+ if (vnode.children != null) {
+ var children = vnode.children
+ createNodes(fragment, children, 0, children.length, hooks, null)
+ }
+ vnode.dom = fragment.firstChild
+ vnode.domSize = fragment.childNodes.length
+ return fragment
+ }
+ function createElement(vnode, hooks) {
+ var tag = vnode.tag
+ var ns = vnode.ns
+
+ var attrs = vnode.attrs
+ var is = attrs && attrs.is
+
+ var element = ns ?
+ is ? $doc.createElementNS(ns, tag, is) : $doc.createElementNS(ns, tag) :
+ is ? $doc.createElement(tag, is) : $doc.createElement(tag)
+ vnode.dom = element
+
+ if (attrs != null) {
+ setAttrs(vnode, attrs)
+ }
+
+ if (vnode.text != null) {
+ if (vnode.text !== "") element.textContent = vnode.text
+ else vnode.children = [Node("#", undefined, undefined, vnode.text, undefined, undefined)]
+ }
+
+ if (vnode.children != null) {
+ var children = vnode.children
+ createNodes(element, children, 0, children.length, hooks, null)
+ setLateAttrs(vnode)
+ }
+ return element
+ }
+ function createComponent(vnode, hooks) {
+ initLifecycle(vnode.tag, vnode, hooks)
+ vnode.instance = Node.normalize(vnode.tag.view.call(vnode, vnode))
+ var element = createNode(vnode.instance, hooks)
+ vnode.dom = vnode.instance.dom
+ vnode.domSize = vnode.instance.domSize
+ return element
+ }
+
+ //update
+ function updateNodes(parent, old, vnodes, hooks, nextSibling) {
+ if (old == null && vnodes == null) return
+ else if (old == null) createNodes(parent, vnodes, 0, vnodes.length, hooks, nextSibling)
+ else if (vnodes == null) removeNodes(parent, old, 0, old.length, vnodes)
+ else {
+ var recycling = isRecyclable(old, vnodes)
+ if (recycling) old = old.concat(old.pool)
+
+ var oldStart = 0, start = 0, oldEnd = old.length - 1, end = vnodes.length - 1, map
+ while (oldEnd >= oldStart && end >= start) {
+ var o = old[oldStart], v = vnodes[start]
+ if (o === v) oldStart++, start++
+ else if (o != null && v != null && o.key === v.key) {
+ oldStart++, start++
+ updateNode(parent, o, v, hooks, getNextSibling(old, oldStart, nextSibling), recycling)
+ if (recycling) insertNode(parent, toFragment(o), nextSibling)
+ }
+ else {
+ var o = old[oldEnd]
+ if (o === v) oldEnd--, start++
+ else if (o != null && v != null && o.key === v.key) {
+ updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), recycling)
+ insertNode(parent, toFragment(o), getNextSibling(old, oldStart, nextSibling))
+ oldEnd--, start++
+ }
+ else break
+ }
+ }
+ while (oldEnd >= oldStart && end >= start) {
+ var o = old[oldEnd], v = vnodes[end]
+ if (o === v) oldEnd--, end--
+ else if (o != null && v != null && o.key === v.key) {
+ updateNode(parent, o, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), recycling)
+ if (recycling) insertNode(parent, toFragment(o), nextSibling)
+ nextSibling = o.dom
+ oldEnd--, end--
+ }
+ else {
+ if (!map) map = getKeyMap(old, oldEnd)
+ if (v != null) {
+ var oldIndex = map[v.key]
+ if (oldIndex != null) {
+ var movable = old[oldIndex]
+ updateNode(parent, movable, v, hooks, getNextSibling(old, oldEnd + 1, nextSibling), recycling)
+ insertNode(parent, toFragment(movable), nextSibling)
+ old[oldIndex].skip = true
+ nextSibling = movable.dom
+ }
+ else {
+ var dom = createNode(v, hooks)
+ insertNode(parent, dom, nextSibling)
+ nextSibling = dom
+ }
+ }
+ end--
+ }
+ if (end < start) break
+ }
+ createNodes(parent, vnodes, start, end + 1, hooks, nextSibling)
+ removeNodes(parent, old, oldStart, oldEnd + 1, vnodes)
+ }
+ }
+ function updateNode(parent, old, vnode, hooks, nextSibling, recycling) {
+ var oldTag = old.tag, tag = vnode.tag
+ if (oldTag === tag) {
+ vnode.state = old.state
+ vnode.events = old.events
+ if (shouldUpdate(vnode, old)) return
+ if (vnode.attrs != null) {
+ updateLifecycle(vnode.attrs, vnode, hooks, recycling)
+ }
+ if (typeof oldTag === "string") {
+ switch (oldTag) {
+ case "#": updateText(old, vnode); break
+ case "<": updateHTML(parent, old, vnode, nextSibling); break
+ case "[": updateFragment(parent, old, vnode, hooks, nextSibling); break
+ default: updateElement(old, vnode, hooks)
+ }
+ }
+ else updateComponent(parent, old, vnode, hooks, nextSibling, recycling)
+ }
+ else {
+ removeNode(parent, old, null, false)
+ insertNode(parent, createNode(vnode, hooks), nextSibling)
+ }
+ }
+ function updateText(old, vnode) {
+ if (old.children.toString() !== vnode.children.toString()) {
+ old.dom.nodeValue = vnode.children
+ }
+ vnode.dom = old.dom
+ }
+ function updateHTML(parent, old, vnode, nextSibling) {
+ if (old.children !== vnode.children) {
+ toFragment(old)
+ insertNode(parent, createHTML(vnode), nextSibling)
+ }
+ else vnode.dom = old.dom
+ }
+ function updateFragment(parent, old, vnode, hooks, nextSibling) {
+ updateNodes(parent, old.children, vnode.children, hooks, nextSibling)
+ var domSize = 0, children = vnode.children
+ vnode.dom = null
+ if (children != null) {
+ for (var i = 0; i < children.length; i++) {
+ var child = children[i]
+ if (child != null) {
+ if (vnode.dom == null) vnode.dom = child.dom
+ domSize += child.domSize || 1
+ }
+ }
+ if (domSize !== 1) vnode.domSize = domSize
+ }
+ }
+ function updateElement(old, vnode, hooks) {
+ var element = vnode.dom = old.dom
+ if (vnode.tag === "textarea") {
+ if (vnode.attrs == null) vnode.attrs = {}
+ if (vnode.text != null) vnode.attrs.value = vnode.text //FIXME handle multiple children
+ }
+ updateAttrs(vnode, old.attrs, vnode.attrs)
+ if (old.text != null && vnode.text != null && vnode.text !== "") {
+ if (old.text.toString() !== vnode.text.toString()) old.dom.firstChild.nodeValue = vnode.text
+ }
+ else {
+ if (old.text != null) old.children = [Node("#", undefined, undefined, old.text, undefined, old.dom.firstChild)]
+ if (vnode.text != null) vnode.children = [Node("#", undefined, undefined, vnode.text, undefined, undefined)]
+ updateNodes(element, old.children, vnode.children, hooks, null)
+ }
+ }
+ function updateComponent(parent, old, vnode, hooks, nextSibling, recycling) {
+ vnode.instance = Node.normalize(vnode.tag.view.call(vnode, vnode))
+ updateLifecycle(vnode.tag, vnode, hooks, recycling)
+ updateNode(parent, old.instance, vnode.instance, hooks, nextSibling, recycling)
+ vnode.dom = vnode.instance.dom
+ vnode.domSize = vnode.instance.domSize
+ }
+ function isRecyclable(old, vnodes) {
+ if (old.pool != null && Math.abs(old.pool.length - vnodes.length) <= Math.abs(old.length - vnodes.length)) {
+ var oldChildrenLength = old[0] && old[0].children && old[0].children.length || 0
+ var poolChildrenLength = old.pool[0] && old.pool[0].children && old.pool[0].children.length || 0
+ var vnodesChildrenLength = vnodes[0] && vnodes[0].children && vnodes[0].children.length || 0
+ if (Math.abs(poolChildrenLength - vnodesChildrenLength) <= Math.abs(oldChildrenLength - vnodesChildrenLength)) {
+ return true
+ }
+ }
+ return false
+ }
+ function getKeyMap(vnodes, end) {
+ var map = {}, i = 0
+ for (var i = 0; i < end; i++) {
+ var vnode = vnodes[i]
+ if (vnode != null) {
+ var key = vnode.key
+ if (key != null) map[key] = i
+ }
+ }
+ return map
+ }
+ function toFragment(vnode) {
+ var count = vnode.domSize
+ if (count != null) {
+ var fragment = $doc.createDocumentFragment()
+ if (count > 0) {
+ var dom = vnode.dom
+ while (--count) fragment.appendChild(dom.nextSibling)
+ fragment.insertBefore(dom, fragment.firstChild)
+ }
+ return fragment
+ }
+ else return vnode.dom
+ }
+ function getNextSibling(vnodes, i, nextSibling) {
+ for (; i < vnodes.length; i++) {
+ if (vnodes[i] != null) return vnodes[i].dom
+ }
+ return nextSibling
+ }
+
+ function insertNode(parent, dom, nextSibling) {
+ if (nextSibling && nextSibling.parentNode) parent.insertBefore(dom, nextSibling)
+ else parent.appendChild(dom)
+ }
+
+ //remove
+ function removeNodes(parent, vnodes, start, end, context) {
+ for (var i = start; i < end; i++) {
+ var vnode = vnodes[i]
+ if (vnode != null) {
+ if (vnode.skip) vnode.skip = undefined
+ else removeNode(parent, vnode, context, false)
+ }
+ }
+ }
+ function removeNode(parent, vnode, context, deferred) {
+ if (deferred === false) {
+ var expected = 0, called = 0
+ var callback = function() {
+ if (++called === expected) removeNode(parent, vnode, context, true)
+ }
+ if (vnode.attrs && vnode.attrs.onbeforeremove) {
+ expected++
+ vnode.attrs.onbeforeremove.call(vnode, vnode, callback)
+ }
+ if (typeof vnode.tag !== "string" && vnode.tag.onbeforeremove) {
+ expected++
+ vnode.tag.onbeforeremove.call(vnode, vnode, callback)
+ }
+ if (expected > 0) return
+ }
+
+ onremove(vnode)
+ if (vnode.dom) {
+ var count = vnode.domSize || 1
+ if (count > 1) {
+ var dom = vnode.dom
+ while (--count) {
+ parent.removeChild(dom.nextSibling)
+ }
+ }
+ if (vnode.dom.parentNode != null) parent.removeChild(vnode.dom)
+ if (context != null && vnode.domSize == null) { //TODO test custom elements
+ if (!context.pool) context.pool = [vnode]
+ else context.pool.push(vnode)
+ }
+ }
+ }
+ function onremove(vnode) {
+ if (vnode.attrs && vnode.attrs.onremove) vnode.attrs.onremove.call(vnode.state, vnode)
+ if (typeof vnode.tag !== "string" && vnode.tag.onremove) vnode.tag.onremove.call(vnode.state, vnode)
+
+ var children = vnode.children
+ if (children instanceof Array) {
+ for (var i = 0; i < children.length; i++) {
+ var child = children[i]
+ if (child != null) onremove(child)
+ }
+ }
+ }
+
+ //attrs
+ function setAttrs(vnode, attrs) {
+ for (var key in attrs) {
+ setAttr(vnode, key, null, attrs[key])
+ }
+ }
+ function setAttr(vnode, key, old, value) {
+ //TODO test input undo history
+ var element = vnode.dom
+ if (key === "key" || (!isFormAttribute(vnode, key) && old === value) || typeof value === "undefined" || isLifecycleMethod(key)) return
+ var nsLastIndex = key.indexOf(":")
+ if (nsLastIndex > -1 && key.substr(0, nsLastIndex) === "xlink") {
+ element.setAttributeNS("http://www.w3.org/1999/xlink", key.slice(nsLastIndex + 1), value)
+ }
+ else if (key[0] === "o" && key[1] === "n" && typeof value === "function") updateEvent(vnode, key, value)
+ else if (key === "style") updateStyle(element, old, value)
+ else if (key in element && !isAttribute(key) && vnode.ns === undefined) element[key] = value
+ else {
+ if (typeof value === "boolean") {
+ if (value) element.setAttribute(key, "")
+ else element.removeAttribute(key)
+ }
+ else element.setAttribute(key === "className" ? "class" : key, value)
+ }
+ }
+ function setLateAttrs(vnode) {
+ var attrs = vnode.attrs
+ if (vnode.tag === "select" && attrs != null) {
+ if ("value" in attrs) setAttr(vnode, "value", null, attrs.value)
+ if ("selectedIndex" in attrs) setAttr(vnode, "selectedIndex", null, attrs.selectedIndex)
+ }
+ }
+ function updateAttrs(vnode, old, attrs) {
+ if (attrs != null) {
+ for (var key in attrs) {
+ setAttr(vnode, key, old && old[key], attrs[key])
+ }
+ }
+ if (old != null) {
+ for (var key in old) {
+ if (attrs == null || !(key in attrs)) {
+ if (key !== "key") vnode.dom.removeAttribute(key)
+ }
+ }
+ }
+ }
+ function isFormAttribute(vnode, attr) {
+ return attr === "value" || attr === "checked" || attr === "selectedIndex" || attr === "selected" && vnode.dom === $doc.activeElement
+ }
+ function isLifecycleMethod(attr) {
+ return attr === "oninit" || attr === "oncreate" || attr === "onupdate" || attr === "onremove" || attr === "onbeforeremove" || attr === "shouldUpdate"
+ }
+ function isAttribute(attr) {
+ return attr === "href" || attr === "list" || attr === "form"// || attr === "type" || attr === "width" || attr === "height"
+ }
+
+ //style
+ function updateStyle(element, old, style) {
+ if (style == null) element.style = ""
+ else if (typeof style === "string") element.style = style
+ else {
+ if (typeof old === "string") element.style = ""
+ for (var key in style) {
+ element.style[key] = style[key]
+ }
+ if (old != null && typeof old !== "string") {
+ for (var key in old) {
+ if (!(key in style)) element.style[key] = ""
+ }
+ }
+ }
+ }
+
+ //event
+ function updateEvent(vnode, key, value) {
+ var element = vnode.dom
+ var callback = function(e) {
+ var result = value.call(element, e)
+ if (typeof onevent === "function") onevent.call(element, e)
+ return result
+ }
+ if (key in element) element[key] = callback
+ else {
+ var eventName = key.slice(2)
+ if (vnode.events === undefined) vnode.events = {}
+ if (vnode.events[key] != null) element.removeEventListener(eventName, vnode.events[key], false)
+ vnode.events[key] = callback
+ element.addEventListener(eventName, vnode.events[key], false)
+ }
+ }
+
+ //lifecycle
+ function initLifecycle(source, vnode, hooks) {
+ if (source.oninit != null) source.oninit.call(vnode.state, vnode)
+ if (source.oncreate != null) hooks.push(source.oncreate.bind(vnode.state, vnode))
+ }
+ function updateLifecycle(source, vnode, hooks, recycling) {
+ if (recycling) initLifecycle(source, vnode, hooks)
+ else if (source.onupdate != null) hooks.push(source.onupdate.bind(vnode.state, vnode))
+ }
+ function shouldUpdate(vnode, old) {
+ var forceVnodeUpdate, forceComponentUpdate
+ if (vnode.attrs != null && typeof vnode.attrs.shouldUpdate === "function") forceVnodeUpdate = vnode.attrs.shouldUpdate.call(vnode.state, vnode, old)
+ if (typeof vnode.tag !== "string" && typeof vnode.tag.shouldUpdate === "function") forceComponentUpdate = vnode.tag.shouldUpdate.call(vnode.state, vnode, old)
+ if (!(forceVnodeUpdate === undefined && forceComponentUpdate === undefined) && !forceVnodeUpdate && !forceComponentUpdate) {
+ vnode.dom = old.dom
+ vnode.domSize = old.domSize
+ vnode.instance = old.instance
+ return true
+ }
+ return false
+ }
+
+ function render(dom, vnodes) {
+ var hooks = []
+ var active = $doc.activeElement
+ if (dom.vnodes == null) dom.vnodes = []
+
+ if (!(vnodes instanceof Array)) vnodes = [vnodes]
+ updateNodes(dom, dom.vnodes, Node.normalizeChildren(vnodes), hooks, null)
+ for (var i = 0; i < hooks.length; i++) hooks[i]()
+ dom.vnodes = vnodes
+ if ($doc.activeElement !== active) active.focus()
+ }
+
+ return {render: render, setEventCallback: setEventCallback}
+}
+
+
+var createMounter = function($window, redraw) {
+ return function(root, component) {
+ var render = createRenderer($window, draw).render
+
+ function draw() {
+ render(root, component)
+ }
+
+ redraw.run = redraw
+ }
+}
+
+var buildQueryString = function buildQueryString(object) {
+ if (Object.prototype.toString.call(object) !== "[object Object]") return ""
+
+ var args = []
+ for (var key in object) {
+ destructure(key, object[key])
+ }
+ return args.join("&")
+
+ function destructure(key, value) {
+ if (value instanceof Array) {
+ for (var i = 0; i < value.length; i++) {
+ destructure(key + "[" + i + "]", value[i])
+ }
+ }
+ else if (Object.prototype.toString.call(value) === "[object Object]") {
+ for (var i in value) {
+ destructure(key + "[" + i + "]", value[i])
+ }
+ }
+ else args.push(encodeURIComponent(key) + (value != null && value !== "" ? "=" + encodeURIComponent(value) : ""))
+ }
+}
+var parseQueryString = function parseQueryString(string) {
+ if (string === "" || string == null) return {}
+ if (string.charAt(0) === "?") string = string.slice(1)
+
+ var entries = string.split("&"), data = {}, counters = {}
+ for (var i = 0; i < entries.length; i++) {
+ var entry = entries[i].split("=")
+ var key = decodeURIComponent(entry[0])
+ var value = entry.length === 2 ? decodeURIComponent(entry[1]) : ""
+
+ //TODO refactor out
+ var number = Number(value)
+ if (value !== "" && !isNaN(number) || value === "NaN") value = number
+ else if (value === "true") value = true
+ else if (value === "false") value = false
+ else {
+ var date = new Date(value)
+ if (!isNaN(date.getTime())) value = date
+ }
+
+ var levels = key.split(/\]\[?|\[/)
+ var cursor = data
+ if (key.indexOf("[") > -1) levels.pop()
+ for (var j = 0; j < levels.length; j++) {
+ var level = levels[j], nextLevel = levels[j + 1]
+ var isNumber = nextLevel == "" || !isNaN(parseInt(nextLevel))
+ var isValue = j === levels.length - 1
+ if (level === "") {
+ var key = levels.slice(0, j).join()
+ if (counters[key] == null) counters[key] = 0
+ level = counters[key]++
+ }
+ if (cursor[level] == null) {
+ cursor[level] = isValue ? value : isNumber ? [] : {}
+ }
+ cursor = cursor[level]
+ }
+ }
+ return data
+}
+
+var createRouter = function($window) {
+ var supportsPushState = typeof $window.history.pushState === "function" && $window.location.protocol !== "file:"
+
+ var prefix = "#!"
+ function setPrefix(value) {prefix = value}
+
+ function normalize(fragment) {
+ var data = $window.location[fragment].replace(/(?:%[a-f89][a-f0-9])+/gim, decodeURIComponent)
+ if (fragment === "pathname" && data[0] !== "/") data = "/" + data
+ return data
+ }
+
+ function parsePath(path, queryData, hashData) {
+ var queryIndex = path.indexOf("?")
+ var hashIndex = path.indexOf("#")
+ var pathEnd = queryIndex > -1 ? queryIndex : hashIndex > -1 ? hashIndex : path.length
+ if (queryIndex > -1) {
+ var queryEnd = hashIndex > -1 ? hashIndex : path.length
+ var queryParams = parseQueryString(path.slice(queryIndex + 1, queryEnd))
+ for (var key in queryParams) queryData[key] = queryParams[key]
+ }
+ if (hashIndex > -1) {
+ var hashParams = parseQueryString(path.slice(hashIndex + 1))
+ for (var key in hashParams) hashData[key] = hashParams[key]
+ }
+ return path.slice(0, pathEnd)
+ }
+
+ function getPath() {
+ var type = prefix.charAt(0)
+ switch (type) {
+ case "#": return normalize("hash").slice(prefix.length)
+ case "?": return normalize("search").slice(prefix.length) + normalize("hash")
+ default: return normalize("pathname") + normalize("search") + normalize("hash")
+ }
+ }
+
+ function setPath(path, data, options) {
+ var queryData = {}, hashData = {}
+ path = parsePath(path, queryData, hashData)
+ if (data != null) {
+ for (var key in data) queryData[key] = data[key]
+ path = path.replace(/:([^\/]+)/g, function(match, token) {
+ delete queryData[token]
+ return data[token]
+ })
+ }
+
+ var query = buildQueryString(queryData)
+ if (query) path += "?" + query
+
+ var hash = buildQueryString(hashData)
+ if (hash) path += "#" + hash
+
+ if (supportsPushState) {
+ if (options && options.replace) $window.history.replaceState(null, null, prefix + path)
+ else $window.history.pushState(null, null, prefix + path)
+ $window.onpopstate()
+ }
+ else $window.location.href = prefix + path
+ }
+
+ function defineRoutes(routes, resolve, reject) {
+ if (supportsPushState) $window.onpopstate = resolveRoute
+ else if (prefix.charAt(0) === "#") $window.onhashchange = resolveRoute
+ resolveRoute()
+
+ function resolveRoute() {
+ var path = getPath()
+ var params = {}
+ var pathname = parsePath(path, params, params)
+
+ for (var route in routes) {
+ var matcher = new RegExp("^" + route.replace(/:[^\/]+?\.{3}/g, "(.*?)").replace(/:[^\/]+/g, "([^\\/]+)") + "\/?$")
+
+ if (matcher.test(pathname)) {
+ pathname.replace(matcher, function() {
+ var keys = route.match(/:[^\/]+/g) || []
+ var values = [].slice.call(arguments, 1, -2)
+ for (var i = 0; i < keys.length; i++) {
+ params[keys[i].replace(/:|\./g, "")] = decodeURIComponent(values[i])
+ }
+ resolve(routes[route], params, path, route)
+ })
+ return
+ }
+ }
+
+ reject(path, params)
+ }
+ return resolveRoute
+ }
+
+ function link(vnode) {
+ vnode.dom.setAttribute("href", prefix + vnode.attrs.href)
+ vnode.dom.onclick = function(e) {
+ e.preventDefault()
+ setPath(vnode.attrs.href)
+ }
+ }
+
+ return {setPrefix: setPrefix, getPath: getPath, setPath: setPath, defineRoutes: defineRoutes, link: link}
+}
+
+var createRouterInstance = function($window, redraw) {
+ var renderer = createRenderer($window)
+ var router = createRouter($window)
+ var route = function(root, defaultRoute, routes) {
+ var replay = router.defineRoutes(routes, function(component, args) {
+ renderer.render(root, {tag: component, attrs: args})
+ }, function() {
+ router.setPath(defaultRoute)
+ })
+ renderer.setEventCallback(replay)
+ redraw.run = replay
+ }
+ route.link = router.link
+ route.prefix = router.setPrefix
+
+ return route
+}
+
+
+
+var createRequester = function($window, Promise) {
+ var callbackCount = 0
+
+ function ajax(args) {
+ return new Promise(function(resolve, reject) {
+ var useBody = args.useBody != null ? args.useBody : args.method !== "GET" && args.method !== "TRACE"
+
+ if (typeof args.serialize !== "function") args.serialize = JSON.stringify
+ if (typeof args.deserialize !== "function") args.deserialize = deserialize
+ if (typeof args.extract !== "function") args.extract = extract
+
+ args.url = interpolate(args.url, args.data)
+ if (useBody) args.data = args.serialize(args.data)
+ else args.url = assemble(args.url, args.data)
+
+ var xhr = new $window.XMLHttpRequest()
+ xhr.open(args.method, args.url, args.async || true, args.user, args.password)
+
+ if (args.serialize === JSON.stringify && useBody) {
+ xhr.setRequestHeader("Content-Type", "application/json; charset=utf-8")
+ }
+ if (args.deserialize === deserialize) {
+ xhr.setRequestHeader("Accept", "application/json, text/*")
+ }
+
+ if (typeof args.config === "function") xhr = args.config(xhr, args) || xhr
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState === 4) {
+ try {
+ var response = args.deserialize(args.extract(xhr, args))
+ if (xhr.status >= 200 && xhr.status < 300) {
+ if (typeof args.type === "function") {
+ if (response instanceof Array) {
+ for (var i = 0; i < response.length; i++) {
+ response[i] = new args.type(response[i])
+ }
+ }
+ else response = new args.type(response[i])
+ }
+
+ resolve(response)
+ }
+ else reject(new Error(xhr.responseText))
+ }
+ catch (e) {
+ reject(e)
+ }
+ }
+ }
+
+ if (useBody) xhr.send(args.data)
+ else xhr.send()
+ })
+ }
+
+ function jsonp(args) {
+ return new Promise(function(resolve, reject) {
+ var callbackKey = "_mithril_" + Math.round(Math.random() * 1e16) + "_" + callbackCount++
+ var script = $window.document.createElement("script")
+ $window[callbackKey] = function(data) {
+ script.parentNode.removeChild(script)
+ resolve(data)
+ $window[callbackKey] = undefined
+ }
+ script.onerror = function(e) {
+ script.parentNode.removeChild(script)
+ reject(new Error("JSONP request failed"))
+ $window[callbackKey] = undefined
+ }
+ if (args.data == null) args.data = {}
+ args.url = interpolate(args.url, args.data)
+ args.data[args.callbackKey || "callback"] = callbackKey
+ script.src = assemble(args.url, args.data)
+ $window.document.documentElement.appendChild(script)
+ })
+ }
+
+ function interpolate(url, data) {
+ if (data == null) return url
+
+ var tokens = url.match(/:[^\/]+/gi) || []
+ for (var i = 0; i < tokens.length; i++) {
+ var key = tokens[i].slice(1)
+ if (data[key] != null) {
+ url = url.replace(tokens[i], data[key])
+ delete data[key]
+ }
+ }
+ return url
+ }
+
+ function assemble(url, data) {
+ var querystring = buildQueryString(data)
+ if (querystring !== "") {
+ var prefix = url.indexOf("?") < 0 ? "?" : "&"
+ url += prefix + querystring
+ }
+ return url
+ }
+
+ function deserialize(data) {
+ try {return data !== "" ? JSON.parse(data) : null}
+ catch (e) {throw new Error(data)}
+ }
+
+ function extract(xhr) {return xhr.responseText}
+
+ return {ajax: ajax, jsonp: jsonp}
+}
+var redraw = {run: function() {}}
+
+m.redraw = function() {
+ redraw.run()
+}
+m.trust = trust
+m.mount = createMounter(window, redraw)
+m.route = createRouterInstance(window, redraw)
+m.request = createRequester(window, Promise).ajax
+
+module.exports = m
diff --git a/mount.js b/mount.js
new file mode 100644
index 00000000..d6a0665b
--- /dev/null
+++ b/mount.js
@@ -0,0 +1,13 @@
+var createRenderer = require("./render/render")
+
+module.exports = function($window, redraw) {
+ return function(root, component) {
+ var render = createRenderer($window, draw).render
+
+ function draw() {
+ render(root, component)
+ }
+
+ redraw.run = redraw
+ }
+}
\ No newline at end of file
diff --git a/render/render.js b/render/render.js
index 94a25943..2c0eb925 100644
--- a/render/render.js
+++ b/render/render.js
@@ -2,9 +2,12 @@
var Node = require("../render/node")
-module.exports = function($window, onevent) {
+module.exports = function($window) {
var $doc = $window.document
+ var onevent
+ function setEventCallback(callback) {return onevent = callback}
+
//create
function createNodes(parent, vnodes, start, end, hooks, nextSibling) {
for (var i = start; i < end; i++) {
@@ -16,10 +19,7 @@ module.exports = function($window, onevent) {
}
function createNode(vnode, hooks) {
var tag = vnode.tag
- if (vnode.attrs) {
- if (vnode.attrs.oninit) vnode.attrs.oninit.call(vnode, vnode)
- if (vnode.attrs.oncreate) hooks.push(vnode.attrs.oncreate.bind(vnode, vnode))
- }
+ if (vnode.attrs != null) initLifecycle(vnode.attrs, vnode, hooks)
if (typeof tag === "string") {
switch (tag) {
case "#": return createText(vnode)
@@ -324,8 +324,8 @@ module.exports = function($window, onevent) {
}
}
function onremove(vnode) {
- if (vnode.attrs && vnode.attrs.onremove) vnode.attrs.onremove.call(vnode, vnode)
- if (typeof vnode.tag !== "string" && vnode.tag.onremove) vnode.tag.onremove.call(vnode, vnode)
+ if (vnode.attrs && vnode.attrs.onremove) vnode.attrs.onremove.call(vnode.state, vnode)
+ if (typeof vnode.tag !== "string" && vnode.tag.onremove) vnode.tag.onremove.call(vnode.state, vnode)
var children = vnode.children
if (children instanceof Array) {
@@ -429,17 +429,17 @@ module.exports = function($window, onevent) {
//lifecycle
function initLifecycle(source, vnode, hooks) {
- if (source.oninit != null) source.oninit.call(vnode, vnode)
- if (source.oncreate != null) hooks.push(source.oncreate.bind(vnode, vnode))
+ if (source.oninit != null) source.oninit.call(vnode.state, vnode)
+ if (source.oncreate != null) hooks.push(source.oncreate.bind(vnode.state, vnode))
}
function updateLifecycle(source, vnode, hooks, recycling) {
if (recycling) initLifecycle(source, vnode, hooks)
- else if (source.onupdate != null) hooks.push(source.onupdate.bind(vnode, vnode))
+ else if (source.onupdate != null) hooks.push(source.onupdate.bind(vnode.state, vnode))
}
function shouldUpdate(vnode, old) {
var forceVnodeUpdate, forceComponentUpdate
- if (vnode.attrs != null && typeof vnode.attrs.shouldUpdate === "function") forceVnodeUpdate = vnode.attrs.shouldUpdate(vnode, old)
- if (typeof vnode.tag !== "string" && typeof vnode.tag.shouldUpdate === "function") forceComponentUpdate = vnode.tag.shouldUpdate(vnode, old)
+ if (vnode.attrs != null && typeof vnode.attrs.shouldUpdate === "function") forceVnodeUpdate = vnode.attrs.shouldUpdate.call(vnode.state, vnode, old)
+ if (typeof vnode.tag !== "string" && typeof vnode.tag.shouldUpdate === "function") forceComponentUpdate = vnode.tag.shouldUpdate.call(vnode.state, vnode, old)
if (!(forceVnodeUpdate === undefined && forceComponentUpdate === undefined) && !forceVnodeUpdate && !forceComponentUpdate) {
vnode.dom = old.dom
vnode.domSize = old.domSize
@@ -460,6 +460,6 @@ module.exports = function($window, onevent) {
dom.vnodes = vnodes
if ($doc.activeElement !== active) active.focus()
}
-
- return {render: render}
+
+ return {render: render, setEventCallback: setEventCallback}
}
diff --git a/render/tests/test-event.js b/render/tests/test-event.js
index 46e3f45b..8263d277 100644
--- a/render/tests/test-event.js
+++ b/render/tests/test-event.js
@@ -10,7 +10,9 @@ o.spec("event", function() {
$window = domMock()
root = $window.document.body
onevent = o.spy()
- render = vdom($window, onevent).render
+ var renderer = vdom($window)
+ renderer.setEventCallback(onevent)
+ render = renderer.render
})
o("handles onclick", function() {
diff --git a/render/tests/test-oncreate.js b/render/tests/test-oncreate.js
index 5077cb33..5cbaf4ea 100644
--- a/render/tests/test-oncreate.js
+++ b/render/tests/test-oncreate.js
@@ -14,135 +14,135 @@ o.spec("oncreate", function() {
o("calls oncreate when creating element", function() {
var callback = o.spy()
- var vnode = {tag: "div", attrs: {oncreate: callback}}
+ var vnode = {tag: "div", attrs: {oncreate: callback}, state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oncreate when creating text", function() {
var callback = o.spy()
- var vnode = {tag: "#", attrs: {oncreate: callback}, children: "a"}
+ var vnode = {tag: "#", attrs: {oncreate: callback}, children: "a", state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oncreate when creating fragment", function() {
var callback = o.spy()
- var vnode = {tag: "[", attrs: {oncreate: callback}, children: []}
+ var vnode = {tag: "[", attrs: {oncreate: callback}, children: [], state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oncreate when creating html", function() {
var callback = o.spy()
- var vnode = {tag: "<", attrs: {oncreate: callback}, children: "a"}
+ var vnode = {tag: "<", attrs: {oncreate: callback}, children: "a", state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oncreate when replacing keyed", function() {
var createDiv = o.spy()
var createA = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oncreate: createDiv}}
- var updated = {tag: "a", key: 1, attrs: {oncreate: createA}}
+ var vnode = {tag: "div", key: 1, attrs: {oncreate: createDiv}, state: {}}
+ var updated = {tag: "a", key: 1, attrs: {oncreate: createA}, state: {}}
render(root, [vnode])
render(root, [updated])
o(createDiv.callCount).equals(1)
- o(createDiv.this).equals(vnode)
+ o(createDiv.this).equals(vnode.state)
o(createDiv.args[0]).equals(vnode)
o(createA.callCount).equals(1)
- o(createA.this).equals(updated)
+ o(createA.this).equals(updated.state)
o(createA.args[0]).equals(updated)
})
o("does not call oncreate when noop", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oncreate: create}}
- var updated = {tag: "div", attrs: {oncreate: update}}
+ var vnode = {tag: "div", attrs: {oncreate: create}, state: {}}
+ var updated = {tag: "div", attrs: {oncreate: update}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oncreate when updating attr", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oncreate: create}}
- var updated = {tag: "div", attrs: {oncreate: update, id: "a"}}
+ var vnode = {tag: "div", attrs: {oncreate: create}, state: {}}
+ var updated = {tag: "div", attrs: {oncreate: update, id: "a"}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oncreate when updating children", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oncreate: create}, children: [{tag: "a"}]}
- var updated = {tag: "div", attrs: {oncreate: update}, children: [{tag: "b"}]}
+ var vnode = {tag: "div", attrs: {oncreate: create}, children: [{tag: "a"}], state: {}}
+ var updated = {tag: "div", attrs: {oncreate: update}, children: [{tag: "b"}], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oncreate when updating keyed", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oncreate: create}}
+ var vnode = {tag: "div", key: 1, attrs: {oncreate: create}, state: {}}
var otherVnode = {tag: "a", key: 2}
- var updated = {tag: "div", key: 1, attrs: {oncreate: update}}
+ var updated = {tag: "div", key: 1, attrs: {oncreate: update}, state: {}}
var otherUpdated = {tag: "a", key: 2}
render(root, [vnode, otherVnode])
render(root, [otherUpdated, updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oncreate when removing", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oncreate: create}}
+ var vnode = {tag: "div", attrs: {oncreate: create}, state: {}}
render(root, [vnode])
render(root, [])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
})
o("calls oncreate when recycling", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oncreate: create}}
- var updated = {tag: "div", key: 1, attrs: {oncreate: update}}
+ var vnode = {tag: "div", key: 1, attrs: {oncreate: create}, state: {}}
+ var updated = {tag: "div", key: 1, attrs: {oncreate: update}, state: {}}
render(root, [vnode])
render(root, [])
@@ -150,28 +150,28 @@ o.spec("oncreate", function() {
o(vnode.dom).equals(updated.dom)
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls oncreate at the same step as onupdate", function() {
var create = o.spy()
var update = o.spy()
var callback = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}, children: []}
- var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "a", attrs: {oncreate: callback}}]}
+ var vnode = {tag: "div", attrs: {onupdate: create}, children: [], state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "a", attrs: {oncreate: callback}, state: {}}], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
o(callback.callCount).equals(1)
- o(callback.this).equals(updated.children[0])
+ o(callback.this).equals(updated.children[0].state)
o(callback.args[0]).equals(updated.children[0])
})
o("calls oncreate after full DOM creation", function() {
diff --git a/render/tests/test-oninit.js b/render/tests/test-oninit.js
index 47ea535a..4190b181 100644
--- a/render/tests/test-oninit.js
+++ b/render/tests/test-oninit.js
@@ -14,135 +14,135 @@ o.spec("oninit", function() {
o("calls oninit when creating element", function() {
var callback = o.spy()
- var vnode = {tag: "div", attrs: {oninit: callback}}
+ var vnode = {tag: "div", attrs: {oninit: callback}, state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oninit when creating text", function() {
var callback = o.spy()
- var vnode = {tag: "#", attrs: {oninit: callback}, children: "a"}
+ var vnode = {tag: "#", attrs: {oninit: callback}, children: "a", state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oninit when creating fragment", function() {
var callback = o.spy()
- var vnode = {tag: "[", attrs: {oninit: callback}, children: []}
+ var vnode = {tag: "[", attrs: {oninit: callback}, children: [], state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oninit when creating html", function() {
var callback = o.spy()
- var vnode = {tag: "<", attrs: {oninit: callback}, children: "a"}
+ var vnode = {tag: "<", attrs: {oninit: callback}, children: "a", state: {}}
render(root, [vnode])
o(callback.callCount).equals(1)
- o(callback.this).equals(vnode)
+ o(callback.this).equals(vnode.state)
o(callback.args[0]).equals(vnode)
})
o("calls oninit when replacing keyed", function() {
var createDiv = o.spy()
var createA = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oninit: createDiv}}
- var updated = {tag: "a", key: 1, attrs: {oninit: createA}}
+ var vnode = {tag: "div", key: 1, attrs: {oninit: createDiv}, state: {}}
+ var updated = {tag: "a", key: 1, attrs: {oninit: createA}, state: {}}
render(root, [vnode])
render(root, [updated])
o(createDiv.callCount).equals(1)
- o(createDiv.this).equals(vnode)
+ o(createDiv.this).equals(vnode.state)
o(createDiv.args[0]).equals(vnode)
o(createA.callCount).equals(1)
- o(createA.this).equals(updated)
+ o(createA.this).equals(updated.state)
o(createA.args[0]).equals(updated)
})
o("does not call oninit when noop", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oninit: create}}
- var updated = {tag: "div", attrs: {oninit: update}}
+ var vnode = {tag: "div", attrs: {oninit: create}, state: {}}
+ var updated = {tag: "div", attrs: {oninit: update}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oninit when updating attr", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oninit: create}}
- var updated = {tag: "div", attrs: {oninit: update, id: "a"}}
+ var vnode = {tag: "div", attrs: {oninit: create}, state: {}}
+ var updated = {tag: "div", attrs: {oninit: update, id: "a"}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oninit when updating children", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oninit: create}, children: [{tag: "a"}]}
- var updated = {tag: "div", attrs: {oninit: update}, children: [{tag: "b"}]}
+ var vnode = {tag: "div", attrs: {oninit: create}, children: [{tag: "a"}], state: {}}
+ var updated = {tag: "div", attrs: {oninit: update}, children: [{tag: "b"}], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oninit when updating keyed", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oninit: create}}
+ var vnode = {tag: "div", key: 1, attrs: {oninit: create}, state: {}}
var otherVnode = {tag: "a", key: 2}
- var updated = {tag: "div", key: 1, attrs: {oninit: update}}
+ var updated = {tag: "div", key: 1, attrs: {oninit: update}, state: {}}
var otherUpdated = {tag: "a", key: 2}
render(root, [vnode, otherVnode])
render(root, [otherUpdated, updated])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(0)
})
o("does not call oninit when removing", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {oninit: create}}
+ var vnode = {tag: "div", attrs: {oninit: create}, state: {}}
render(root, [vnode])
render(root, [])
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
})
o("calls oninit when recycling", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", key: 1, attrs: {oninit: create}}
- var updated = {tag: "div", key: 1, attrs: {oninit: update}}
+ var vnode = {tag: "div", key: 1, attrs: {oninit: create}, state: {}}
+ var updated = {tag: "div", key: 1, attrs: {oninit: update}, state: {}}
render(root, [vnode])
render(root, [])
@@ -150,28 +150,28 @@ o.spec("oninit", function() {
o(vnode.dom).equals(updated.dom)
o(create.callCount).equals(1)
- o(create.this).equals(vnode)
+ o(create.this).equals(vnode.state)
o(create.args[0]).equals(vnode)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(updated.state)
o(update.args[0]).equals(updated)
})
o("calls oninit at the same step as onupdate", function() {
var create = o.spy()
var update = o.spy()
var callback = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}, children: []}
- var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "a", attrs: {oninit: callback}}]}
+ var vnode = {tag: "div", attrs: {onupdate: create}, children: [], state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "a", attrs: {oninit: callback}, state: {}}], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
o(callback.callCount).equals(1)
- o(callback.this).equals(updated.children[0])
+ o(callback.this).equals(updated.children[0].state)
o(callback.args[0]).equals(updated.children[0])
})
o("calls oninit before full DOM creation", function() {
diff --git a/render/tests/test-onremove.js b/render/tests/test-onremove.js
index acc5dc8f..651dfa1e 100644
--- a/render/tests/test-onremove.js
+++ b/render/tests/test-onremove.js
@@ -37,46 +37,46 @@ o.spec("onremove", function() {
})
o("calls onremove when removing element", function() {
var remove = o.spy()
- var vnode = {tag: "div", attrs: {onremove: remove}}
+ var vnode = {tag: "div", attrs: {onremove: remove}, state: {}}
render(root, [vnode])
render(root, [])
o(remove.callCount).equals(1)
- o(remove.this).equals(vnode)
+ o(remove.this).equals(vnode.state)
o(remove.args[0]).equals(vnode)
})
o("calls onremove when removing text", function() {
var remove = o.spy()
- var vnode = {tag: "#", attrs: {onremove: remove}, children: "a"}
+ var vnode = {tag: "#", attrs: {onremove: remove}, children: "a", state: {}}
render(root, [vnode])
render(root, [])
o(remove.callCount).equals(1)
- o(remove.this).equals(vnode)
+ o(remove.this).equals(vnode.state)
o(remove.args[0]).equals(vnode)
})
o("calls onremove when removing fragment", function() {
var remove = o.spy()
- var vnode = {tag: "[", attrs: {onremove: remove}, children: []}
+ var vnode = {tag: "[", attrs: {onremove: remove}, children: [], state: {}}
render(root, [vnode])
render(root, [])
o(remove.callCount).equals(1)
- o(remove.this).equals(vnode)
+ o(remove.this).equals(vnode.state)
o(remove.args[0]).equals(vnode)
})
o("calls onremove when removing html", function() {
var remove = o.spy()
- var vnode = {tag: "<", attrs: {onremove: remove}, children: "a"}
+ var vnode = {tag: "<", attrs: {onremove: remove}, children: "a", state: {}}
render(root, [vnode])
render(root, [])
o(remove.callCount).equals(1)
- o(remove.this).equals(vnode)
+ o(remove.this).equals(vnode.state)
o(remove.args[0]).equals(vnode)
})
o("does not set onremove as an event handler", function() {
diff --git a/render/tests/test-onupdate.js b/render/tests/test-onupdate.js
index e3ee6a75..b699ce9f 100644
--- a/render/tests/test-onupdate.js
+++ b/render/tests/test-onupdate.js
@@ -15,15 +15,15 @@ o.spec("onupdate", function() {
o("does not call onupdate when creating element", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}}
- var updated = {tag: "div", attrs: {onupdate: update}}
+ var vnode = {tag: "div", attrs: {onupdate: create}, state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("does not call onupdate when removing element", function() {
@@ -74,85 +74,85 @@ o.spec("onupdate", function() {
o("calls onupdate when noop", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}}
- var updated = {tag: "div", attrs: {onupdate: update}}
+ var vnode = {tag: "div", attrs: {onupdate: create}, state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate when updating attr", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}}
- var updated = {tag: "div", attrs: {onupdate: update, id: "a"}}
+ var vnode = {tag: "div", attrs: {onupdate: create}, state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update, id: "a"}, state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate when updating children", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "div", attrs: {onupdate: create}, children: [{tag: "a"}]}
- var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "b"}]}
+ var vnode = {tag: "div", attrs: {onupdate: create}, children: [{tag: "a"}], state: {}}
+ var updated = {tag: "div", attrs: {onupdate: update}, children: [{tag: "b"}], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate when updating text", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "#", attrs: {onupdate: create}, children: "a"}
- var updated = {tag: "#", attrs: {onupdate: update}, children: "a"}
+ var vnode = {tag: "#", attrs: {onupdate: create}, children: "a", state: {}}
+ var updated = {tag: "#", attrs: {onupdate: update}, children: "a", state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate when updating fragment", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "[", attrs: {onupdate: create}, children: []}
- var updated = {tag: "[", attrs: {onupdate: update}, children: []}
+ var vnode = {tag: "[", attrs: {onupdate: create}, children: [], state: {}}
+ var updated = {tag: "[", attrs: {onupdate: update}, children: [], state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate when updating html", function() {
var create = o.spy()
var update = o.spy()
- var vnode = {tag: "<", attrs: {onupdate: create}, children: "a"}
- var updated = {tag: "<", attrs: {onupdate: update}, children: "a"}
+ var vnode = {tag: "<", attrs: {onupdate: create}, children: "a", state: {}}
+ var updated = {tag: "<", attrs: {onupdate: update}, children: "a", state: {}}
render(root, [vnode])
render(root, [updated])
o(create.callCount).equals(0)
o(update.callCount).equals(1)
- o(update.this).equals(updated)
+ o(update.this).equals(vnode.state)
o(update.args[0]).equals(updated)
})
o("calls onupdate after full DOM update", function() {
diff --git a/router.js b/router.js
new file mode 100644
index 00000000..25701196
--- /dev/null
+++ b/router.js
@@ -0,0 +1,20 @@
+var createRenderer = require("./render/render")
+var createRouter = require("./router/router")
+
+module.exports = function($window, redraw) {
+ var renderer = createRenderer($window)
+ var router = createRouter($window)
+ var route = function(root, defaultRoute, routes) {
+ var replay = router.defineRoutes(routes, function(component, args) {
+ renderer.render(root, {tag: component, attrs: args})
+ }, function() {
+ router.setPath(defaultRoute)
+ })
+ renderer.setEventCallback(replay)
+ redraw.run = replay
+ }
+ route.link = router.link
+ route.prefix = router.setPrefix
+
+ return route
+}
diff --git a/router/router.js b/router/router.js
index 9dabbcf1..446edd06 100644
--- a/router/router.js
+++ b/router/router.js
@@ -3,9 +3,12 @@
var buildQueryString = require("../querystring/build")
var parseQueryString = require("../querystring/parse")
-module.exports = function($window, prefix) {
+module.exports = function($window) {
var supportsPushState = typeof $window.history.pushState === "function" && $window.location.protocol !== "file:"
+ var prefix = "#!"
+ function setPrefix(value) {prefix = value}
+
function normalize(fragment) {
var data = $window.location[fragment].replace(/(?:%[a-f89][a-f0-9])+/gim, decodeURIComponent)
if (fragment === "pathname" && data[0] !== "/") data = "/" + data
@@ -93,5 +96,13 @@ module.exports = function($window, prefix) {
return resolveRoute
}
- return {getPath: getPath, setPath: setPath, defineRoutes: defineRoutes}
+ function link(vnode) {
+ vnode.dom.setAttribute("href", prefix + vnode.attrs.href)
+ vnode.dom.onclick = function(e) {
+ e.preventDefault()
+ setPath(vnode.attrs.href)
+ }
+ }
+
+ return {setPrefix: setPrefix, getPath: getPath, setPath: setPath, defineRoutes: defineRoutes, link: link}
}
\ No newline at end of file
diff --git a/router/tests/test-defineRoutes.js b/router/tests/test-defineRoutes.js
index 0de90388..b396036e 100644
--- a/router/tests/test-defineRoutes.js
+++ b/router/tests/test-defineRoutes.js
@@ -11,7 +11,8 @@ o.spec("Router.defineRoutes", function() {
o.beforeEach(function() {
$window = pushStateMock()
- router = new Router($window, prefix)
+ router = new Router($window)
+ router.setPrefix(prefix)
onRouteChange = o.spy()
onFail = o.spy()
})
diff --git a/router/tests/test-getPath.js b/router/tests/test-getPath.js
new file mode 100644
index 00000000..fcfeaba5
--- /dev/null
+++ b/router/tests/test-getPath.js
@@ -0,0 +1,46 @@
+"use strict"
+
+var o = require("../../ospec/ospec")
+var pushStateMock = require("../../test-utils/pushStateMock")
+var Router = require("../../router/router")
+
+o.spec("Router.getPath", function() {
+ void ["#", "?", "", "#!", "?!"].forEach(function(prefix) {
+ o.spec("using prefix `" + prefix + "`", function() {
+ var $window, router, onRouteChange, onFail
+
+ o.beforeEach(function() {
+ $window = pushStateMock()
+ router = new Router($window)
+ router.setPrefix(prefix)
+ onRouteChange = o.spy()
+ onFail = o.spy()
+ })
+
+ o("gets route", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}}, onRouteChange, onFail)
+
+ o(router.getPath()).equals("/test")
+ })
+ o("gets route w/ params", function() {
+ $window.location.href = prefix + "/other/x/y/z?c=d#e=f"
+ router.defineRoutes({"/test": {data: 1}, "/other/:a/:b...": {data: 2}}, onRouteChange, onFail)
+
+ o(router.getPath()).equals("/other/x/y/z?c=d#e=f")
+ })
+ o("gets route w/ escaped unicode", function() {
+ $window.location.href = prefix + "/%C3%B6?%C3%B6=%C3%B6#%C3%B6=%C3%B6"
+ router.defineRoutes({"/test": {data: 1}, "/ö/:a/:b...": {data: 2}}, onRouteChange, onFail)
+
+ o(router.getPath()).equals("/ö?ö=ö#ö=ö")
+ })
+ o("gets route w/ unicode", function() {
+ $window.location.href = prefix + "/ö?ö=ö#ö=ö"
+ router.defineRoutes({"/test": {data: 1}, "/ö/:a/:b...": {data: 2}}, onRouteChange, onFail)
+
+ o(router.getPath()).equals("/ö?ö=ö#ö=ö")
+ })
+ })
+ })
+})
\ No newline at end of file
diff --git a/router/tests/test-setPath.js b/router/tests/test-setPath.js
new file mode 100644
index 00000000..f178ce88
--- /dev/null
+++ b/router/tests/test-setPath.js
@@ -0,0 +1,74 @@
+"use strict"
+
+var o = require("../../ospec/ospec")
+var pushStateMock = require("../../test-utils/pushStateMock")
+var Router = require("../../router/router")
+
+o.spec("Router.setPath", function() {
+ void ["#", "?", "", "#!", "?!"].forEach(function(prefix) {
+ o.spec("using prefix `" + prefix + "`", function() {
+ var $window, router, onRouteChange, onFail
+
+ o.beforeEach(function() {
+ $window = pushStateMock()
+ router = new Router($window)
+ router.setPrefix(prefix)
+ onRouteChange = o.spy()
+ onFail = o.spy()
+ })
+
+ o("sets route via API", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/other/:a/:b...": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/other/x/y/z?c=d#e=f")
+
+ o(router.getPath()).equals("/other/x/y/z?c=d#e=f")
+ })
+ o("sets route w/ escaped unicode", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/ö/:a/:b...": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/%C3%B6?%C3%B6=%C3%B6#%C3%B6=%C3%B6")
+
+ o(router.getPath()).equals("/ö?ö=ö#ö=ö")
+ })
+ o("sets route w/ unicode", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/ö/:a/:b...": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/ö?ö=ö#ö=ö")
+
+ o(router.getPath()).equals("/ö?ö=ö#ö=ö")
+ })
+ o("sets route via pushState/onpopstate", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/other/:a/:b...": {data: 2}}, onRouteChange, onFail)
+ $window.history.pushState(null, null, prefix + "/other/x/y/z?c=d#e=f")
+ $window.onpopstate()
+
+ o(router.getPath()).equals("/other/x/y/z?c=d#e=f")
+ })
+ o("sets parameterized route", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/other/:a/:b...": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/other/:a/:b", {a: "x", b: "y/z", c: "d", e: "f"})
+
+ o(router.getPath()).equals("/other/x/y/z?c=d&e=f")
+ })
+ o("replace:true works", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/other": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/other", null, {replace: true})
+ $window.history.back()
+
+ o($window.location.href).equals("http://localhost/")
+ })
+ o("replace:false works", function() {
+ $window.location.href = prefix + "/test"
+ router.defineRoutes({"/test": {data: 1}, "/other": {data: 2}}, onRouteChange, onFail)
+ router.setPath("/other", null, {replace: false})
+ $window.history.back()
+
+ o($window.location.href).equals("http://localhost/" + (prefix ? prefix + "/" : "") + "test")
+ })
+ })
+ })
+})
\ No newline at end of file