Merge branch 'master' into bug/image-upload

[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 2efaf66c6ffa75a4799c196a56617763755bfc3d..cb525b9593c05ca3678abc84866a543659feb301 100644 (file)
--- a/resources/assets/js/pages/page-show.js
+++ b/resources/assets/js/pages/page-show.js
@@ -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;
     });