Removed forced initial image manager display

[bookstack] / resources / js / services / util.js

diff --git a/resources/js/services/util.js b/resources/js/services/util.js
index 1a56ebf6ce8595a29cab4f48fbd9422f9a9649a2..dd97d81aaf47113b301660794eda9b881d54e1e8 100644 (file)
--- a/resources/js/services/util.js
+++ b/resources/js/services/util.js
@@ -1,5 +1,3 @@
-
-

 /**
  * Returns a function, that, as long as it continues to be invoked, will not
  * be triggered. The function will be called after it stops being called for
 /**
  * Returns a function, that, as long as it continues to be invoked, will not
  * be triggered. The function will be called after it stops being called for


@@ -13,9 +11,9 @@
  */
 export function debounce(func, wait, immediate) {
     let timeout;
  */
 export function debounce(func, wait, immediate) {
     let timeout;

-    return function() {
-        const context = this, args = arguments;
-        const later = function() {
+    return function debouncedWrapper(...args) {
+        const context = this;
+        const later = function debouncedTimeout() {

             timeout = null;
             if (!immediate) func.apply(context, args);
         };
             timeout = null;
             if (!immediate) func.apply(context, args);
         };


@@ -24,7 +22,7 @@ export function debounce(func, wait, immediate) {
         timeout = setTimeout(later, wait);
         if (callNow) func.apply(context, args);
     };
         timeout = setTimeout(later, wait);
         if (callNow) func.apply(context, args);
     };

-};
+}

 
 /**
  * Scroll and highlight an element.
 
 /**
  * Scroll and highlight an element.


@@ -34,7 +32,7 @@ export function scrollAndHighlightElement(element) {
     if (!element) return;
     element.scrollIntoView({behavior: 'smooth'});
 
     if (!element) return;
     element.scrollIntoView({behavior: 'smooth'});
 

-    const color = document.getElementById('custom-styles').getAttribute('data-color-light');
+    const color = getComputedStyle(document.body).getPropertyValue('--color-primary-light');

     const initColor = window.getComputedStyle(element).getPropertyValue('background-color');
     element.style.backgroundColor = color;
     setTimeout(() => {
     const initColor = window.getComputedStyle(element).getPropertyValue('background-color');
     element.style.backgroundColor = color;
     setTimeout(() => {


@@ -55,11 +53,11 @@ export function scrollAndHighlightElement(element) {
  */
 export function escapeHtml(unsafe) {
     return unsafe
  */
 export function escapeHtml(unsafe) {
     return unsafe

-        .replace(/&/g, "&")
-        .replace(/</g, "&lt;")
-        .replace(/>/g, "&gt;")
-        .replace(/"/g, "&quot;")
-        .replace(/'/g, "&#039;");
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&#039;');

 }
 
 /**
 }
 
 /**


@@ -68,6 +66,7 @@ export function escapeHtml(unsafe) {
  * @returns {string}
  */
 export function uniqueId() {
  * @returns {string}
  */
 export function uniqueId() {

-    const S4 = () => (((1+Math.random())*0x10000)|0).toString(16).substring(1);
-    return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());
-}
\ No newline at end of file
+    // eslint-disable-next-line no-bitwise
+    const S4 = () => (((1 + Math.random()) * 0x10000) | 0).toString(16).substring(1);
+    return (`${S4() + S4()}-${S4()}-${S4()}-${S4()}-${S4()}${S4()}${S4()}`);
+}