Merge branch 'master' into summary/scrolling

_layouts/website/summary.html

 {% macro articles(_articles) %}
     {% for article in _articles %}
         <li class="chapter {% if article.path == file.path and not article.anchor %}active{% endif %}" data-level="{{ article.level }}" {% if article.path %}data-path="{{ article.path|resolveFile }}"{% endif %}>
-            {% if article.path %}
+            {% if article.path and getPageByPath(article.path) %}
                 <a href="{{ article.path|resolveFile }}{{ article.anchor }}">
             {% elif article.url %}
                 <a target="_blank" href="{{ article.url }}">

package.json

@@ -2,7 +2,7 @@
   "name": "gitbook-plugin-theme-default",
   "description": "Default theme for GitBook",
   "main": "./index.js",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "engines": {
     "gitbook": ">=3.0.0"
   },

src/js/theme/navigation.js

@@ -194,32 +194,45 @@ function handleNavigation(relativeUrl, push) {
 
     prevUri = uri;
 
-    return loading.show($.get(uri)
-    .then(function (html) {
+    var promise = $.Deferred(function(deferred) {
+        $.ajax({
+            type: 'GET',
+            url: uri,
+            cache: true,
+            headers:{
+                'Access-Control-Expose-Headers': 'X-Current-Location'
+            },
+            success: function(html, status, xhr) {
+                // For GitBook.com, we handle redirection signaled by the server
+                var responseURL = xhr.getResponseHeader('X-Current-Location') || uri;
+
                 // Replace html content
                 html = html.replace( /<(\/?)(html|head|body)([^>]*)>/ig, function(a,b,c,d){
                     return '<' + b + 'div' + ( b ? '' : ' data-element="' + c + '"' ) + d + '>';
                 });
 
-        var $page = $(html);
-        var $pageHead = $page.find('[data-element=head]');
-        var $pageBody = $page.find('.book');
+                var $page = $(html),
+                    $pageBody = $page.find('.book'),
+                    $pageHead;
 
                 // We only use history.pushState for pages generated with GitBook
                 if ($pageBody.length === 0) {
-            return $.Deferred(function (deferred) {
                     var err = new Error('Invalid gitbook page, redirecting...');
-                deferred.reject(err);
-            }).promise();
+                    return deferred.reject(err);
                 }
 
                 // Push url to history
                 if (push) {
                     history.pushState({
-                path: uri
-            }, null, uri);
+                        path: responseURL
+                    }, null, responseURL);
                 }
 
+                // Force reparsing HTML to prevent wrong URLs in Safari
+                $page = $(html);
+                $pageHead = $page.find('[data-element=head]');
+                $pageBody = $page.find('.book');
+
                 // Merge heads
                 // !! Warning !!: we only update necessary portions to avoid strange behavior (page flickering etc ...)
 
@@ -256,10 +269,19 @@ function handleNavigation(relativeUrl, push) {
                 if (hash) {
                     scrollToHash(hash);
                 }
-    })
+
+                deferred.resolve();
+            }
+        });
+    }).promise();
+
+    return loading.show(
+        promise
         .fail(function (e) {
-        location.href = relativeUrl;
-    }));
+            console.log(e); // eslint-disable-line no-console
+            // location.href = relativeUrl;
+        })
+    );
 }
 
 function updateNavigationPosition() {