Merge remote-tracking branch 'origin/rewrite' into rewrite
Conflicts: mithril.min.js
This commit is contained in:
commit
17161a05c5
10 changed files with 122 additions and 54 deletions
3
index.js
3
index.js
|
|
@ -1,6 +1,6 @@
|
|||
"use strict"
|
||||
|
||||
var m = require("./render/hyperscript")
|
||||
var m = require("./hyperscript")
|
||||
var renderService = require("./render")
|
||||
var requestService = require("./request")
|
||||
var redrawService = require("./redraw")
|
||||
|
|
@ -11,7 +11,6 @@ requestService.setCompletionCallback(redrawService.publish)
|
|||
|
||||
m.route = require("./route")
|
||||
m.mount = require("./mount")
|
||||
m.trust = require("./render/trust")
|
||||
m.withAttr = require("./util/withAttr")
|
||||
m.prop = require("./stream")
|
||||
m.render = renderService.render
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue