add support for custom noRoutesTemplate and clarify default template #…

…976 #1481 #1168 #996 #944

Guide.md

@@ -800,11 +800,11 @@ method.
 Router.configure({
   layoutTemplate: 'ApplicationLayout',
 
-  template: 'DefaultTemplate'
+  template: 'DefaultTemplate',
 
-  // .
-  // .
-  // .
+  notFoundTemplate: 'RouteNotFound',
+
+  noRoutesTemplate: 'ReplacesSplashScreen'
 });
 ```
 

lib/router_client.js

@@ -54,7 +54,7 @@ Router.prototype.createView = function () {
 Router.prototype.lookupNotFoundTemplate = function () {
   if (this.options.notFoundTemplate)
     return this.options.notFoundTemplate;
-  
+
   return (this.routes.length === 0) ? NO_ROUTES_TEMPLATE : DEFAULT_NOT_FOUND_TEMPLATE;
 };
 
@@ -102,8 +102,8 @@ Router.prototype.dispatch = function (url, context, done) {
       if (!controller.isHandled()) {
         // if we aren't at the initial state, we haven't yet given the server
         //   a true chance to handle this URL. We'll try.
-        //   if the server CAN'T handle the router, we'll be back, 
-        //   but as the very first route handled on the client, 
+        //   if the server CAN'T handle the router, we'll be back,
+        //   but as the very first route handled on the client,
         //   and so initial will be true.
         var state = Deps.nonreactive(function () { return controller.location.get().options.historyState; });
 
@@ -115,19 +115,23 @@ Router.prototype.dispatch = function (url, context, done) {
           // NOTE: this => controller
           this.layout(this.lookupOption('layoutTemplate'), {data: {url: this.url}});
 
-          var notFoundTemplate = this.lookupOption('notFoundTemplate');
+          var errorTemplate;
+
+          if (self.routes.length === 0) {
+            errorTemplate = this.lookupOption('noRoutesTemplate') || NO_ROUTES_TEMPLATE;
+          } else {
+            errorTemplate = this.lookupOption('notFoundTemplate') || DEFAULT_NOT_FOUND_TEMPLATE;
+          }
 
-          if (!notFoundTemplate)
-            notFoundTemplate = (self.routes.length === 0) ? NO_ROUTES_TEMPLATE : DEFAULT_NOT_FOUND_TEMPLATE;
-          this.render(notFoundTemplate, {data: {url: this.url}});
+          this.render(errorTemplate, {data: {url: this.url}});
           this.renderRegions();
 
           // kind of janky but will work for now. this makes sure
           // that any downstream functions see that this route has been
           // handled so we don't get into an infinite loop with the
           // server.
           controller.isHandled = function () { return true; };
-        } 
+        }
 
         return done && done.call(controller);
       }

lib/templates.html

@@ -11,27 +11,29 @@
       <h1 style='text-align: center; margin: 0; font-size: 48pt;'>
         iron:router
       </h1>
-      <p style='text-align: center; font-size: 1.3em;'>
-        Organize your Meteor application.
+      <p style='text-align: center; font-size: 1.3em; color: red;'>
+        No route definitions found.
       </p>
       <div style='margin: 50px 0px;'>
+        <p>To create a route:</p>
         <pre style='background: #f2f2f2; margin: 0; padding: 10px;'>
 Router.route('/', function () {
   this.render('Home', {
     data: function () { return Items.findOne({_id: this.params._id}); }
   });
 });
         </pre>
+        <p style="text-align:center"><small>To hide this page, set 'noRoutesTemplate' in <a href="http://iron-meteor.github.io/iron-router/#global-default-options" target="_blank">Router.configure()</a></small></p>
       </div>
-      <div style='margin: 50px 0px;'>
+      <div style='margin: 50px 0px; text-align: center;'>
         Check it out on Github:<br>
-        <a href='https://github.com/eventedmind/iron-router' target='_blank'>https://github.com/eventedmind/iron-router</a>
+        <a href='https://github.com/iron-meteor/iron-router/' target='_blank'>https://github.com/iron-meteor/iron-router/</a>
         <br>
         <br>
         And check out the new Guide:<br>
         <a href='https://iron-meteor.github.io/iron-router' target='_blank'>
           https://iron-meteor.github.io/iron-router
         </a>
       </div>
-    </div> 
+    </div>
 </template>

package.js

@@ -1,7 +1,7 @@
 Package.describe({
   name: 'iron:router',
   summary: 'Routing specifically designed for Meteor',
-  version: '1.0.12',
+  version: '1.1.0',
   git: 'https://github.com/iron-meteor/iron-router'
 });