Merge branch 'bundler-fix' into rewrite
Conflicts: api/mount.js api/router.js api/tests/test-router.js index.js
This commit is contained in:
commit
acd9d5b641
10 changed files with 91 additions and 548 deletions
|
|
@ -1,12 +1,12 @@
|
|||
"use strict"
|
||||
|
||||
var createRenderer = require("../render/render")
|
||||
var createRouter = require("../router/router")
|
||||
var coreRenderer = require("../render/render")
|
||||
var coreRouter = require("../router/router")
|
||||
var throttle = require("../api/throttle")
|
||||
|
||||
module.exports = function($window, renderers) {
|
||||
var renderer = createRenderer($window)
|
||||
var router = createRouter($window)
|
||||
var renderer = coreRenderer($window)
|
||||
var router = coreRouter($window)
|
||||
var route = function(root, defaultRoute, routes) {
|
||||
var replay = router.defineRoutes(routes, function(component, args) {
|
||||
renderer.render(root, {tag: component, attrs: args})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue