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

show error message if m.route.param is called before m.route(el, defRoute, routes)

Browse source
This commit is contained in:
Leo Horie 2014-12-01 11:03:07 -05:00
parent e3b6243d7b
commit c5939e6fac
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
mithril.js
View file

@ -553,10 +553,11 @@ var m = (function app(window, undefined) {
//routing //routing
var modes = {pathname: "", hash: "#", search: "?"}; var modes = {pathname: "", hash: "#", search: "?"};
var redirect = function() {}, routeParams = {}, currentRoute; var redirect = function() {}, routeParams, currentRoute;
m.route = function() { m.route = function() {
//m.route() //m.route()
if (arguments.length === 0) return currentRoute; if (arguments.length === 0) return currentRoute;
//m.route(el, defaultRoute, routes)
else if (arguments.length === 3 && type.call(arguments[1]) == STRING) { else if (arguments.length === 3 && type.call(arguments[1]) == STRING) {
var root = arguments[0], defaultRoute = arguments[1], router = arguments[2]; var root = arguments[0], defaultRoute = arguments[1], router = arguments[2];
redirect = function(source) { redirect = function(source) {
@ -606,7 +607,10 @@ var m = (function app(window, undefined) {
else $location[m.route.mode] = currentRoute else $location[m.route.mode] = currentRoute
} }
}; };
m.route.param = function(key) {return routeParams[key]}; m.route.param = function(key) {
if (!routeParams) throw new Error("You must call m.route(element, defaultRoute, routes) before calling m.route.param()")
return routeParams[key]
};
m.route.mode = "search"; m.route.mode = "search";
function normalizeRoute(route) {return route.slice(modes[m.route.mode].length)} function normalizeRoute(route) {return route.slice(modes[m.route.mode].length)}
function routeByValue(root, router, path) { function routeByValue(root, router, path) {