vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rebuild

Browse source
This commit is contained in:
Leo Horie 2016-07-15 01:22:47 -04:00
parent 084d99f125
commit d8b48666f4
2 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
index.js
View file

@ -17,9 +17,9 @@ m.route = require("./api/router")(window, renderService, redrawService)
m.mount = require("./api/mount")(renderService, redrawService) m.mount = require("./api/mount")(renderService, redrawService)
m.trust = require("./render/trust") m.trust = require("./render/trust")
m.prop = Stream.stream m.prop = Stream.stream
m.prop.sync = Stream.sync
m.prop.combine = Stream.combine m.prop.combine = Stream.combine
m.prop.reject = Stream.reject m.prop.reject = Stream.reject
m.prop.merge = Stream.merge
m.prop.HALT = Stream.HALT m.prop.HALT = Stream.HALT
m.withAttr = require("./util/withAttr") m.withAttr = require("./util/withAttr")
m.render = renderService.render m.render = renderService.render

12
mithril.js
View file

@ -168,7 +168,12 @@ function reject(e) {
stream.error(e) stream.error(e)
return stream return stream
} }
var Stream = {stream: createStream, combine: combine, reject: reject, HALT: HALT} function merge(streams) {
return combine(function () {
return streams.map(function (s) {return s()})
}, streams)
}
var Stream = {stream: createStream, merge: merge, combine: combine, reject: reject, HALT: HALT}
function Node(tag, key, attrs, children, text, dom) { 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, instance: undefined} return {tag: tag, key: key, attrs: attrs, children: children, text: text, dom: dom, domSize: undefined, state: {}, events: undefined, instance: undefined}
} }
@ -1065,8 +1070,8 @@ m.route = function($window, renderer, pubsub) {
else { else {
renderer.render(root, Node(payload, null, args, undefined, undefined, undefined)) renderer.render(root, Node(payload, null, args, undefined, undefined, undefined))
} }
}, function() { }, function(path, params) {
router.setPath(defaultRoute) router.setPath(defaultRoute, params, {replace: true})
}) })
autoredraw(root, renderer, pubsub, replay) autoredraw(root, renderer, pubsub, replay)
} }
@ -1091,6 +1096,7 @@ m.trust = function(html) {
m.prop = Stream.stream m.prop = Stream.stream
m.prop.combine = Stream.combine m.prop.combine = Stream.combine
m.prop.reject = Stream.reject m.prop.reject = Stream.reject
m.prop.merge = Stream.merge
m.prop.HALT = Stream.HALT m.prop.HALT = Stream.HALT
m.withAttr = function(attrName, callback, context) { m.withAttr = function(attrName, callback, context) {
return function(e) { return function(e) {