Russian lang added

[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 4f8f6e0f1df8e0bd2b1eede82d32ae8895654ce9..14437cd68a326466b1179cf4639154e329386999 100644 (file)
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -1,13 +1,19 @@
-"use strict";
-// Configure ZeroClipboard
-import ZeroClipBoard from "zeroclipboard";
+const Clipboard = require("clipboard");
+const Code = require('../code');

 
 

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

 
     // Set up pointer
     let $pointer = $('#pointer').detach();
 
     // Set up pointer
     let $pointer = $('#pointer').detach();

+    let pointerShowing = false;

     let $pointerInner = $pointer.children('div.pointer').first();
     let isSelection = 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) {


@@ -15,19 +21,34 @@ export default window.setupPageShow = function (pageId) {
         e.stopPropagation();
     });
 
         e.stopPropagation();
     });
 

-    // Set up copy-to-clipboard
-    ZeroClipBoard.config({
-        swfPath: window.baseUrl('/ZeroClipboard.swf')
+    // 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();

     });
     });

-    new ZeroClipBoard($pointer.find('button').first()[0]);
+
+    // 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();


@@ -36,12 +57,12 @@ export default window.setupPageShow = function (pageId) {
 
         // Show pointer and set link
         let $elem = $(this);
 
         // Show pointer and set link
         let $elem = $(this);

-        let link = window.baseUrl('/link/' + pageId + '#' + $elem.attr('id'));
-        if (link.indexOf('http') !== 0) link = window.location.protocol + "//" + window.location.host + link;
-        $pointer.find('input').val(link);
-        $pointer.find('button').first().attr('data-clipboard-text', link);
+        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
         let pointerLeftOffset = (e.pageX - $elem.offset().left - ($pointerInner.width() / 2));
 
         // Set pointer to sit near mouse-up position
         let pointerLeftOffset = (e.pageX - $elem.offset().left - ($pointerInner.width() / 2));


@@ -60,9 +81,7 @@ export default window.setupPageShow = function (pageId) {
         let idElem = document.getElementById(text);
         $('.page-content [data-highlighted]').attr('data-highlighted', '').css('background-color', '');
         if (idElem !== null) {
         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();
+            window.scrollAndHighlight(idElem);

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


@@ -79,25 +98,25 @@ export default window.setupPageShow = function (pageId) {
         goToText(event.target.getAttribute('href').substr(1));
     });
 
         goToText(event.target.getAttribute('href').substr(1));
     });
 

-    // Make the book-tree sidebar stick in view on scroll
+    // Make the sidebar stick in view on scroll

     let $window = $(window);
     let $window = $(window);

-    let $bookTree = $(".book-tree");
-    let $bookTreeParent = $bookTree.parent();
+    let $sidebar = $("#sidebar .scroll-body");
+    let $bookTreeParent = $sidebar.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

-    let pageScrollable = ($(document).height() > $window.height()) && ($bookTree.height() < $('.page-content').height());
+    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
     function stickTree() {
     // 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
     function stickTree() {

-        $bookTree.width($bookTreeParent.width() + 15);
-        $bookTree.addClass("fixed");
+        $sidebar.width($bookTreeParent.width() + 15);
+        $sidebar.addClass("fixed");

         isFixed = true;
     }
     // Function to un-fix the tree back into position
     function unstickTree() {
         isFixed = true;
     }
     // Function to un-fix the tree back into position
     function unstickTree() {

-        $bookTree.css('width', 'auto');
-        $bookTree.removeClass("fixed");
+        $sidebar.css('width', 'auto');
+        $sidebar.removeClass("fixed");

         isFixed = false;
     }
     // Checks if the tree stickiness state should change
         isFixed = false;
     }
     // Checks if the tree stickiness state should change


@@ -131,5 +150,6 @@ export default window.setupPageShow = function (pageId) {
             unstickTree();
         }
     });
             unstickTree();
         }
     });

-

 };
 };

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