Merge branch 'master' into network-first

shendepu · Mar 2, 2016 · 32171af · 32171af
2 parents d354a7b + 5c05603
commit 32171af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/router.js b/lib/router.js
@@ -105,7 +105,7 @@ Router.prototype._match = function(method, methodMaps, pathOrUrl) {
 
   for (var i = 0; i < methodMaps.length; i++) {
     var methodMap = methodMaps[i];
-    var routeMap = methodMap.get(method.toLowerCase());
+    var routeMap = methodMap && methodMap.get(method.toLowerCase());
     if (routeMap) {
       var routes = keyMatch(routeMap, pathOrUrl);
       if (routes.length > 0) {

diff --git a/sw-toolbox.js b/sw-toolbox.js
diff --git a/sw-toolbox.map.json b/sw-toolbox.map.json