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

2
api/tests/test-mount.js
View file

@ -4,7 +4,7 @@ var o = require("../../ospec/ospec")
var domMock = require("../../test-utils/domMock")
var m = require("../../render/hyperscript")
var createMounter = require("../mount")
var apiMounter = require("../../api/mount")
o.spec("m.mount", function() {
var FRAME_BUDGET = 1000 / 60

4
api/tests/test-router.js
View file

@ -5,7 +5,7 @@ var pushStateMock = require("../../test-utils/pushStateMock")
var domMock = require("../../test-utils/domMock")
var m = require("../../render/hyperscript")
var router = require("../../api/router")
var apiRouter = require("../../api/router")
o.spec("m.route", function() {
var FRAME_BUDGET = 1000 / 60
@ -23,7 +23,7 @@ o.spec("m.route", function() {
root = $window.document.body
renderers = []
route = router($window, renderers)
route = apiRouter($window, redraw)
})
o("pushes a render function", function() {