X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/fff5bbcee458992443e3732fbcbbbe34f765fcc3..refs/pull/474/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 41b92453f..7754840af 100644
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -1,16 +1,19 @@
-"use strict";
-// Configure ZeroClipboard
-var zeroClipBoard = require('zeroclipboard');
-zeroClipBoard.config({
- swfPath: window.baseUrl('/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
- 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) {
@@ -18,35 +21,53 @@ window.setupPageShow = module.exports = function (pageId) {
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 ? '' : '');
+ updatePointerContent();
+ });
+
+ // Set up clipboard
+ let clipboard = new Clipboard('#pointer button');
// 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();
- var selection = window.getSelection();
+ let selection = window.getSelection();
if (selection.toString().length === 0) return;
// Show pointer and set link
- var $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);
+ let $elem = $(this);
+ pointerSectionId = $elem.attr('id');
+ updatePointerContent();
+
$elem.before($pointer);
$pointer.show();
+ pointerShowing = true;
// 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;
- var pointerLeftOffsetPercent = (pointerLeftOffset / $elem.width()) * 100;
+ let pointerLeftOffsetPercent = (pointerLeftOffset / $elem.width()) * 100;
$pointerInner.css('left', pointerLeftOffsetPercent + '%');
isSelection = true;
@@ -57,10 +78,18 @@ window.setupPageShow = module.exports = function (pageId) {
// 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();
}
@@ -68,19 +97,24 @@ window.setupPageShow = module.exports = function (pageId) {
// 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);
}
+ // 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
- var $window = $(window);
- var $bookTree = $(".book-tree");
- var $bookTreeParent = $bookTree.parent();
+ let $window = $(window);
+ let $bookTree = $(".book-tree");
+ let $bookTreeParent = $bookTree.parent();
// 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
- var headerHeight = $("#header").height() + $(".toolbar").height();
- var isFixed = $window.scrollTop() > headerHeight;
+ 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);
@@ -95,7 +129,7 @@ window.setupPageShow = module.exports = function (pageId) {
}
// 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)) {
@@ -125,4 +159,8 @@ window.setupPageShow = module.exports = function (pageId) {
}
});
+ // in order to call from other places.
+ window.setupPageShow.goToText = goToText;
};
+
+module.exports = setupPageShow;
\ No newline at end of file