X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/bdba25b6f2e9361229b43c646b40f4e9fbba0ed7..refs/pull/711/head:/resources/assets/js/pages/page-show.js

diff --git a/resources/assets/js/pages/page-show.js b/resources/assets/js/pages/page-show.js
index 3693031fb..cb525b959 100644
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -1,5 +1,5 @@
 const Clipboard = require("clipboard");
-const Code = require('../code');
+const Code = require('../libs/code');
 
 let setupPageShow = window.setupPageShow = function (pageId) {
 
@@ -16,28 +16,31 @@ let setupPageShow = window.setupPageShow = function (pageId) {
     let pointerSectionId = '';
 
     // Select all contents on input click
-    $pointer.on('click', 'input', function (e) {
+    $pointer.on('click', 'input', event => {
         $(this).select();
-        e.stopPropagation();
+        event.stopPropagation();
+    });
+
+    $pointer.on('click focus', event => {
+        event.stopPropagation();
     });
 
     // Pointer mode toggle
     $pointer.on('click', 'span.icon', event => {
+        event.stopPropagation();
         let $icon = $(event.currentTarget);
         pointerModeLink = !pointerModeLink;
-        $icon.html(pointerModeLink ? '<i class="zmdi zmdi-link"></i>' : '<i class="zmdi zmdi-square-down"></i>');
+        $icon.find('[data-icon="include"]').toggle(!pointerModeLink);
+        $icon.find('[data-icon="link"]').toggle(pointerModeLink);
         updatePointerContent();
     });
 
     // Set up clipboard
-    let clipboard = new Clipboard('#pointer button');
+    let clipboard = new Clipboard($pointer[0].querySelector('button'));
 
     // Hide pointer when clicking away
     $(document.body).find('*').on('click focus', event => {
         if (!pointerShowing || isSelection) return;
-        let target = $(event.target);
-        if (target.is('.zmdi') || $(event.target).closest('#pointer').length === 1) return;
-
         $pointer.detach();
         pointerShowing = false;
     });
@@ -102,23 +105,28 @@ let setupPageShow = window.setupPageShow = function (pageId) {
     let $window = $(window);
     let $sidebar = $("#sidebar .scroll-body");
     let $bookTreeParent = $sidebar.parent();
+
     // Check the page is scrollable and the content is taller than the tree
     let pageScrollable = ($(document).height() > $window.height()) && ($sidebar.height() < $('.page-content').height());
+
     // Get current tree's width and header height
     let headerHeight = $("#header").height() + $(".toolbar").height();
     let isFixed = $window.scrollTop() > headerHeight;
-    // Function to fix the tree as a sidebar
+
+    // Fix the tree as a sidebar
     function stickTree() {
         $sidebar.width($bookTreeParent.width() + 15);
         $sidebar.addClass("fixed");
         isFixed = true;
     }
-    // Function to un-fix the tree back into position
+
+    // Un-fix the tree back into position
     function unstickTree() {
         $sidebar.css('width', 'auto');
         $sidebar.removeClass("fixed");
         isFixed = false;
     }
+
     // Checks if the tree stickiness state should change
     function checkTreeStickiness(skipCheck) {
         let shouldBeFixed = $window.scrollTop() > headerHeight;
@@ -160,27 +168,22 @@ let setupPageShow = window.setupPageShow = function (pageId) {
     }
 
     function addPageHighlighting() {
-      let $pageNav = null;
-
-      $(document).ready(function () {
-          // fetch all the headings.
-          let headings = document.querySelector('.page-content').querySelectorAll('h1, h2, h3, h4, h5, h6');
-          // if headings are present, add observers.
-          if (headings.length > 0) {
-              addNavObserver(headings);
-          }
-      });
+      let pageNav = document.querySelector('.sidebar-page-nav');
+
+      // fetch all the headings.
+      let headings = document.querySelector('.page-content').querySelectorAll('h1, h2, h3, h4, h5, h6');
+      // if headings are present, add observers.
+      if (headings.length > 0 && pageNav !== null) {
+          addNavObserver(headings);
+      }
 
       function addNavObserver(headings) {
           // Setup the intersection observer.
-          // margin top = -35px to trigger the threshold change before the heading
-          // has completely left the viewport on the top.
           let intersectOpts = {
-              rootMargin: '-35px 0px 0px 0px',
+              rootMargin: '0px 0px 0px 0px',
               threshold: 1.0
-          }
-          $pageNav = $('.sidebar-page-nav');
-          let pageNavObserver = new IntersectionObserver(cbHeadingVisible, intersectOpts);
+          };
+          let pageNavObserver = new IntersectionObserver(headingVisibilityChange, intersectOpts);
 
           // observe each heading
           for (let i = 0; i !== headings.length; ++i) {
@@ -188,24 +191,25 @@ let setupPageShow = window.setupPageShow = function (pageId) {
           }
       }
 
-      function cbHeadingVisible(entries, observer) {
-          let element = null;
-          for (let i = 0; i !== entries.length; ++i) {
+      function headingVisibilityChange(entries, observer) {
+          for (let i = 0; i < entries.length; i++) {
               let currentEntry = entries[i];
-              // check if its currently visible and its distance from top of viewport is less than 100
-              if (currentEntry.intersectionRatio <= 1 && currentEntry.boundingClientRect.y < 100) {
-                  element = currentEntry.target;
-              } else {
-                  break;
-              }
-          }
-          if (!element) {
-              return;
+              let isVisible = (currentEntry.intersectionRatio === 1);
+              toggleAnchorHighlighting(currentEntry.target.id, isVisible);
           }
-          let elementId = element.id;
-          $pageNav.find('a').removeClass('current-heading');
-          $pageNav.find('a[href="#' + elementId + '"]').addClass('current-heading');
       }
+
+        function toggleAnchorHighlighting(elementId, shouldHighlight) {
+            let anchorsToHighlight = pageNav.querySelectorAll('a[href="#' + elementId + '"]');
+            for (let i = 0; i < anchorsToHighlight.length; i++) {
+                // Change below to use classList.toggle when IE support is dropped.
+                if (shouldHighlight) {
+                    anchorsToHighlight[i].classList.add('current-heading');
+                } else {
+                    anchorsToHighlight[i].classList.remove('current-heading');
+                }
+            }
+        }
     }
 };