This commit is contained in:
Leo Horie 2016-10-03 10:56:44 -04:00
parent 6c4765bb39
commit d0a4993681
2 changed files with 25 additions and 25 deletions

View file

@ -94,12 +94,12 @@ This method also allows you to asynchronously define what component will be rend
`routeResolver.onmatch(resolve, args, requestedPath)` `routeResolver.onmatch(resolve, args, requestedPath)`
Argument | Type | Description Argument | Type | Description
--------------- | --------------------- | --- --------------- | ------------------------ | ---
`resolve` | `Function(Component)` | Call this function with a component as the first argument to use it as the route's component `resolve` | `Component -> undefined` | Call this function with a component as the first argument to use it as the route's component
`args` | `Object` | The [routing parameters](#routing-parameters) `args` | `Object` | The [routing parameters](#routing-parameters)
`requestedPath` | `String` | The router path requested by the last routing action, including interpolated routing parameter values, but without the prefix. When `onmatch` is called, the resolution for this path is not complete and `m.route.get()` still returns the previous path. `requestedPath` | `String` | The router path requested by the last routing action, including interpolated routing parameter values, but without the prefix. When `onmatch` is called, the resolution for this path is not complete and `m.route.get()` still returns the previous path.
**returns** | | Returns `undefined` **returns** | | Returns `undefined`
##### routeResolver.render ##### routeResolver.render

View file

@ -86,26 +86,26 @@ module.exports = function() {
* @return {string[]} * @return {string[]}
*/ */
function splitDeclList(declList) { function splitDeclList(declList) {
var indices = [], res = [], match var indices = [], res = [], match
// remove comments, preserving comments in strings. // remove comments, preserving comments in strings.
declList = declList.replace( declList = declList.replace(
/("(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*')|\/\*[\s\S]*?\*\//g, /("(?:\\.|[^"\n])*"|'(?:\\.|[^'\n])*')|\/\*[\s\S]*?\*\//g,
function(m, str){ function(m, str){
return str || '' return str || ''
} }
) )
/*eslint-disable no-cond-assign*/ /*eslint-disable no-cond-assign*/
while (match = declListTokenizer.exec(declList)) { while (match = declListTokenizer.exec(declList)) {
if (match[0] === ";") indices.push(match.index) if (match[0] === ";") indices.push(match.index)
} }
/*eslint-enable no-cond-assign*/ /*eslint-enable no-cond-assign*/
for (var i = indices.length; i--;){ for (var i = indices.length; i--;){
res.unshift(declList.slice(indices[i] + 1)) res.unshift(declList.slice(indices[i] + 1))
declList = declList.slice(0, indices[i]) declList = declList.slice(0, indices[i])
} }
res.unshift(declList) res.unshift(declList)
return res return res
} }
var activeElement var activeElement