diff --git a/index.js b/index.js index 102c4145..5c91f7db 100644 --- a/index.js +++ b/index.js @@ -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 diff --git a/mithril.js b/mithril.js index d6adbadb..6f293f48 100644 --- a/mithril.js +++ b/mithril.js @@ -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 diff --git a/stream/index.js b/stream/index.js new file mode 100644 index 00000000..454a90fc --- /dev/null +++ b/stream/index.js @@ -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