X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/91444e83fd2df128e5f01a767c5cf00eb2ffe7e9..refs/pull/714/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 8c2f0e300..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;
     });
@@ -170,7 +173,7 @@ let setupPageShow = window.setupPageShow = function (pageId) {
       // 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) {
+      if (headings.length > 0 && pageNav !== null) {
           addNavObserver(headings);
       }