From 0bcf608e0b3e52b85da551e7484c28f04b805cce Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Sat, 14 Jan 2017 16:36:12 +0000
Subject: [PATCH] Fixed page navigation with special chars in id

Also made so it smooth-scrolls and uses app theme color.
Fixes #254
---
 resources/assets/js/global.js          |  5 ++---
 resources/assets/js/pages/page-show.js | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/resources/assets/js/global.js b/resources/assets/js/global.js
index 94462ed64..650919f85 100644
--- a/resources/assets/js/global.js
+++ b/resources/assets/js/global.js
@@ -61,10 +61,9 @@ Controllers(ngApp, window.Events);
 // Smooth scrolling
 jQuery.fn.smoothScrollTo = function () {
     if (this.length === 0) return;
-    let scrollElem = document.documentElement.scrollTop === 0 ?  document.body : document.documentElement;
-    $(scrollElem).animate({
+    $('html, body').animate({
         scrollTop: this.offset().top - 60 // Adjust to change final scroll position top margin
-    }, 800); // Adjust to change animations speed (ms)
+    }, 300); // Adjust to change animations speed (ms)
     return this;
 };
 
diff --git a/resources/assets/js/pages/page-show.js b/resources/assets/js/pages/page-show.js
index 0cdde790d..4f8f6e0f1 100644
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -1,6 +1,6 @@
 "use strict";
 // Configure ZeroClipboard
-import zeroClipBoard from "zeroclipboard";
+import ZeroClipBoard from "zeroclipboard";
 
 export default window.setupPageShow = function (pageId) {
 
@@ -16,10 +16,10 @@ export default window.setupPageShow = function (pageId) {
     });
 
     // Set up copy-to-clipboard
-    zeroClipBoard.config({
+    ZeroClipBoard.config({
         swfPath: window.baseUrl('/ZeroClipboard.swf')
     });
-    new zeroClipBoard($pointer.find('button').first()[0]);
+    new ZeroClipBoard($pointer.find('button').first()[0]);
 
     // Hide pointer when clicking away
     $(document.body).find('*').on('click focus', function (e) {
@@ -57,10 +57,12 @@ export default window.setupPageShow = function (pageId) {
 
     // Go to, and highlight if necessary, the specified text.
     function goToText(text) {
-        let idElem = $('.page-content #' + text).first();
-        if (idElem.length !== 0) {
-            idElem.smoothScrollTo();
-            idElem.css('background-color', 'rgba(244, 249, 54, 0.25)');
+        let idElem = document.getElementById(text);
+        $('.page-content [data-highlighted]').attr('data-highlighted', '').css('background-color', '');
+        if (idElem !== null) {
+            let $idElem = $(idElem);
+            let color = $('#custom-styles').attr('data-color-light');
+            $idElem.css('background-color', color).attr('data-highlighted', 'true').smoothScrollTo();
         } else {
             $('.page-content').find(':contains("' + text + '")').smoothScrollTo();
         }
@@ -72,6 +74,11 @@ export default window.setupPageShow = function (pageId) {
         goToText(text);
     }
 
+    // Sidebar page nav click event
+    $('.sidebar-page-nav').on('click', 'a', event => {
+        goToText(event.target.getAttribute('href').substr(1));
+    });
+
     // Make the book-tree sidebar stick in view on scroll
     let $window = $(window);
     let $bookTree = $(".book-tree");