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

Merge pull request #1240 from sebastiansandqvist/rewrite

Browse source 
Piecemeal stream usage
This commit is contained in:
Leo Horie 2016-08-16 08:28:44 -04:00 • committed by GitHub
commit ca4c91a3d3
3 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
index.js
View file

@ -1,8 +1,7 @@
"use strict"
var log = console.error.bind(console)
var StreamFactory = require("./util/stream")
var Stream = StreamFactory(log)
var defaultStream = require("./stream/index")
var m = require("./render/hyperscript")
var renderService = require("./render/render")(window)
var requestService = require("./request/request")(window, log)
@ -14,11 +13,7 @@ m.route = require("./api/router")(window, renderService, redrawService)
m.mount = require("./api/mount")(renderService, redrawService)
m.trust = require("./render/trust")
m.withAttr = require("./util/withAttr")
m.prop = Stream.stream
m.prop.combine = Stream.combine
m.prop.reject = Stream.reject
m.prop.merge = Stream.merge
m.prop.HALT = Stream.HALT
m.prop = defaultStream
m.render = renderService.render
m.redraw = redrawService.publish
m.request = requestService.xhr

12
mithril.js
View file

@ -1,5 +1,6 @@
new function() {
var log = console.error.bind(console)
var log = console.error.bind(console)
var StreamFactory = function(log) {
var guid = 0, noop = function() {}, HALT = {}
@ -186,6 +187,11 @@ var StreamFactory = function(log) {
return {stream: createStream, merge: merge, combine: combine, reject: reject, HALT: HALT}
}
var Stream = StreamFactory(log)
var defaultStream = Stream.stream
defaultStream.combine = Stream.combine
defaultStream.reject = Stream.reject
defaultStream.merge = Stream.merge
defaultStream.HALT = Stream.HALT
function Vnode(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}
}
@ -1134,11 +1140,7 @@ m.withAttr = function(attrName, callback, context) {
return callback.call(context || this, attrName in e.currentTarget ? e.currentTarget[attrName] : e.currentTarget.getAttribute(attrName))
}
}
m.prop = Stream.stream
m.prop.combine = Stream.combine
m.prop.reject = Stream.reject
m.prop.merge = Stream.merge
m.prop.HALT = Stream.HALT
m.prop = defaultStream
m.render = renderService.render
m.redraw = redrawService.publish
m.request = requestService.xhr

13
stream/index.js Normal file
View file

@ -0,0 +1,13 @@
"use strict"
var log = console.error.bind(console)
var StreamFactory = require("../util/stream")
var Stream = StreamFactory(log)
var defaultStream = Stream.stream
defaultStream.combine = Stream.combine
defaultStream.reject = Stream.reject
defaultStream.merge = Stream.merge
defaultStream.HALT = Stream.HALT
module.exports = defaultStream