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

Merge branch 'bundler-fix' into rewrite

Browse source 
Conflicts:
	api/mount.js
	api/router.js
	api/tests/test-router.js
	index.js
This commit is contained in:
Leo Horie 2016-05-20 22:45:51 -04:00
commit acd9d5b641
10 changed files with 91 additions and 548 deletions
Download patch file Download diff file Expand all files Collapse all files

20
index.js
View file

@ -2,18 +2,18 @@
var m = require("./render/hyperscript")
var trust = require("./render/trust")
var createRenderer = require("./render/render")
var createRedraw = require("./api/redraw")
var createMounter = require("./api/mount")
var createRouterInstance = require("./api/router")
var createRequester = require("./request/request")
var coreRenderer = require("./render/render")
var apiRedraw = require("./api/redraw")
var apiMounter = require("./api/mount")
var apiRouter = require("./api/router")
var coreRequester = require("./request/request")
var renderers = []
m.redraw = createRedraw(renderers)
m.redraw = apiRedraw(renderers)
m.trust = trust
m.render = createRenderer(window).render
m.mount = createMounter(window, renderers)
m.route = createRouterInstance(window, renderers)
m.request = createRequester(window, Promise).ajax
m.render = coreRenderer(window).render
m.mount = apiMounter(window, renderers)
m.route = apiRouter(window, renderers)
m.request = coreRequester(window, Promise).ajax
module.exports = m