Resolves book heading issues in grid view.

[bookstack] / 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 3ddece1b8dfbb182d39f907c927f7b4a9970e00f..67d339d63a32c139831550c7be13bc9ee3fa9f13 100644 (file)
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -1,16 +1,21 @@
 "use strict";
 // Configure ZeroClipboard
 "use strict";
 // Configure ZeroClipboard

-var zeroClipBoard = require('zeroclipboard');
-zeroClipBoard.config({
-    swfPath: '/ZeroClipboard.swf'
-});
+const Clipboard = require("clipboard");
+const Code = require('../code');

 
 

-window.setupPageShow = module.exports = function (pageId) {
+let setupPageShow = window.setupPageShow = function (pageId) {
+
+    Code.highlight();
+
+    if (!pageId) return;

 
     // Set up pointer
 
     // Set up pointer

-    var $pointer = $('#pointer').detach();
-    var $pointerInner = $pointer.children('div.pointer').first();
-    var isSelection = false;
+    let $pointer = $('#pointer').detach();
+    let pointerShowing = false;
+    let $pointerInner = $pointer.children('div.pointer').first();
+    let isSelection = false;
+    let pointerModeLink = true;
+    let pointerSectionId = '';

 
     // Select all contents on input click
     $pointer.on('click', 'input', function (e) {
 
     // Select all contents on input click
     $pointer.on('click', 'input', function (e) {


@@ -18,34 +23,53 @@ window.setupPageShow = module.exports = function (pageId) {
         e.stopPropagation();
     });
 
         e.stopPropagation();
     });
 

-    // Set up copy-to-clipboard
-    new zeroClipBoard($pointer.find('button').first()[0]);
+    // Pointer mode toggle
+    $pointer.on('click', 'span.icon', event => {
+        let $icon = $(event.currentTarget);
+        pointerModeLink = !pointerModeLink;
+        $icon.html(pointerModeLink ? '<i class="zmdi zmdi-link"></i>' : '<i class="zmdi zmdi-square-down"></i>');
+        updatePointerContent();
+    });
+
+    // Set up clipboard
+    let clipboard = new Clipboard('#pointer button');

 
     // Hide pointer when clicking away
 
     // Hide pointer when clicking away

-    $(document.body).find('*').on('click focus', function (e) {
-        if (!isSelection) {
-            $pointer.detach();
-        }
+    $(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;

     });
 
     });
 

+    function updatePointerContent() {
+        let inputText = pointerModeLink ? window.baseUrl(`/link/${pageId}#${pointerSectionId}`) : `{{@${pageId}#${pointerSectionId}}}`;
+        if (pointerModeLink && inputText.indexOf('http') !== 0) inputText = window.location.protocol + "//" + window.location.host + inputText;
+
+        $pointer.find('input').val(inputText);
+    }
+

     // Show pointer when selecting a single block of tagged content
     $('.page-content [id^="bkmrk"]').on('mouseup keyup', function (e) {
         e.stopPropagation();
     // Show pointer when selecting a single block of tagged content
     $('.page-content [id^="bkmrk"]').on('mouseup keyup', function (e) {
         e.stopPropagation();

-        var selection = window.getSelection();
+        let selection = window.getSelection();

         if (selection.toString().length === 0) return;
 
         // Show pointer and set link
         if (selection.toString().length === 0) return;
 
         // Show pointer and set link

-        var $elem = $(this);
-        var link = window.location.protocol + "//" + window.location.host + '/link/' + pageId + '#' + $elem.attr('id');
-        $pointer.find('input').val(link);
-        $pointer.find('button').first().attr('data-clipboard-text', link);
+        let $elem = $(this);
+        pointerSectionId = $elem.attr('id');
+        updatePointerContent();
+

         $elem.before($pointer);
         $pointer.show();
         $elem.before($pointer);
         $pointer.show();

+        pointerShowing = true;

 
         // Set pointer to sit near mouse-up position
 
         // Set pointer to sit near mouse-up position

-        var pointerLeftOffset = (e.pageX - $elem.offset().left - ($pointerInner.width() / 2));
+        let pointerLeftOffset = (e.pageX - $elem.offset().left - ($pointerInner.width() / 2));

         if (pointerLeftOffset < 0) pointerLeftOffset = 0;
         if (pointerLeftOffset < 0) pointerLeftOffset = 0;

-        var pointerLeftOffsetPercent = (pointerLeftOffset / $elem.width()) * 100;
+        let pointerLeftOffsetPercent = (pointerLeftOffset / $elem.width()) * 100;

         $pointerInner.css('left', pointerLeftOffsetPercent + '%');
 
         isSelection = true;
         $pointerInner.css('left', pointerLeftOffsetPercent + '%');
 
         isSelection = true;


@@ -56,10 +80,18 @@ window.setupPageShow = module.exports = function (pageId) {
 
     // Go to, and highlight if necessary, the specified text.
     function goToText(text) {
 
     // Go to, and highlight if necessary, the specified text.
     function goToText(text) {

-        var 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();
+            setTimeout(() => {
+                $idElem.addClass('anim').addClass('selectFade').css('background-color', '');
+                setTimeout(() => {
+                   $idElem.removeClass('selectFade');
+                }, 3000);
+            }, 100);

         } else {
             $('.page-content').find(':contains("' + text + '")').smoothScrollTo();
         }
         } else {
             $('.page-content').find(':contains("' + text + '")').smoothScrollTo();
         }


@@ -67,22 +99,27 @@ window.setupPageShow = module.exports = function (pageId) {
 
     // Check the hash on load
     if (window.location.hash) {
 
     // Check the hash on load
     if (window.location.hash) {

-        var text = window.location.hash.replace(/\%20/g, ' ').substr(1);
+        let text = window.location.hash.replace(/\%20/g, ' ').substr(1);

         goToText(text);
     }
 
         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
     // Make the book-tree sidebar stick in view on scroll

-    var $window = $(window);
-    var $bookTree = $(".book-tree");
+    let $window = $(window);
+    let $bookTree = $(".book-tree");
+    let $bookTreeParent = $bookTree.parent();

     // Check the page is scrollable and the content is taller than the tree
     // Check the page is scrollable and the content is taller than the tree

-    var pageScrollable = ($(document).height() > $window.height()) && ($bookTree.height() < $('.page-content').height());
+    let pageScrollable = ($(document).height() > $window.height()) && ($bookTree.height() < $('.page-content').height());

     // Get current tree's width and header height
     // Get current tree's width and header height

-    var headerHeight = $("#header").height() + $(".toolbar").height();
-    var isFixed = $window.scrollTop() > headerHeight;
-    var bookTreeWidth = $bookTree.width();
+    let headerHeight = $("#header").height() + $(".toolbar").height();
+    let isFixed = $window.scrollTop() > headerHeight;

     // Function to fix the tree as a sidebar
     function stickTree() {
     // Function to fix the tree as a sidebar
     function stickTree() {

-        $bookTree.width(bookTreeWidth + 48 + 15);
+        $bookTree.width($bookTreeParent.width() + 15);

         $bookTree.addClass("fixed");
         isFixed = true;
     }
         $bookTree.addClass("fixed");
         isFixed = true;
     }


@@ -94,20 +131,36 @@ window.setupPageShow = module.exports = function (pageId) {
     }
     // Checks if the tree stickiness state should change
     function checkTreeStickiness(skipCheck) {
     }
     // Checks if the tree stickiness state should change
     function checkTreeStickiness(skipCheck) {

-        var shouldBeFixed = $window.scrollTop() > headerHeight;
+        let shouldBeFixed = $window.scrollTop() > headerHeight;

         if (shouldBeFixed && (!isFixed || skipCheck)) {
             stickTree();
         } else if (!shouldBeFixed && (isFixed || skipCheck)) {
             unstickTree();
         }
     }
         if (shouldBeFixed && (!isFixed || skipCheck)) {
             stickTree();
         } else if (!shouldBeFixed && (isFixed || skipCheck)) {
             unstickTree();
         }
     }

+    // The event ran when the window scrolls
+    function windowScrollEvent() {
+        checkTreeStickiness(false);
+    }
+

     // If the page is scrollable and the window is wide enough listen to scroll events
     // and evaluate tree stickiness.
     if (pageScrollable && $window.width() > 1000) {
     // If the page is scrollable and the window is wide enough listen to scroll events
     // and evaluate tree stickiness.
     if (pageScrollable && $window.width() > 1000) {

-        $window.scroll(function() {
-            checkTreeStickiness(false);
-        });
+        $window.on('scroll', windowScrollEvent);

         checkTreeStickiness(true);
     }
 
         checkTreeStickiness(true);
     }
 

+    // Handle window resizing and switch between desktop/mobile views
+    $window.on('resize', event => {
+        if (pageScrollable && $window.width() > 1000) {
+            $window.on('scroll', windowScrollEvent);
+            checkTreeStickiness(true);
+        } else {
+            $window.off('scroll', windowScrollEvent);
+            unstickTree();
+        }
+    });
+

 };
 };

+
+module.exports = setupPageShow;
\ No newline at end of file