From: Dan Brown <redacted>
Date: Sun, 11 Nov 2018 11:44:35 +0000 (+0000)
Subject: Merge branch 'master' into 2019-design
X-Git-Tag: v0.26.0~1^2~23^2~61
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/4a872012c5568c59aec7dc9825bee28902ce3431?hp=-c

Merge branch 'master' into 2019-design
---

4a872012c5568c59aec7dc9825bee28902ce3431
diff --combined resources/assets/js/components/index.js
index a9ce31362,bf6fbf619..7007b5878
--- a/resources/assets/js/components/index.js
+++ b/resources/assets/js/components/index.js
@@@ -1,31 -1,51 +1,53 @@@
+ import dropdown from "./dropdown";
+ import overlay from "./overlay";
+ import backToTop from "./back-to-top";
+ import notification from "./notification";
+ import chapterToggle from "./chapter-toggle";
+ import expandToggle from "./expand-toggle";
+ import entitySelectorPopup from "./entity-selector-popup";
+ import entitySelector from "./entity-selector";
+ import sidebar from "./sidebar";
+ import pagePicker from "./page-picker";
+ import pageComments from "./page-comments";
+ import wysiwygEditor from "./wysiwyg-editor";
+ import markdownEditor from "./markdown-editor";
+ import editorToolbox from "./editor-toolbox";
+ import imagePicker from "./image-picker";
+ import collapsible from "./collapsible";
+ import toggleSwitch from "./toggle-switch";
+ import pageDisplay from "./page-display";
+ import shelfSort from "./shelf-sort";
+ import homepageControl from "./homepage-control";
++import headerMobileToggle from "./header-mobile-toggle";
  
- let componentMapping = {
-     'dropdown': require('./dropdown'),
-     'overlay': require('./overlay'),
-     'back-to-top': require('./back-top-top'),
-     'notification': require('./notification'),
-     'chapter-toggle': require('./chapter-toggle'),
-     'expand-toggle': require('./expand-toggle'),
-     'entity-selector-popup': require('./entity-selector-popup'),
-     'entity-selector': require('./entity-selector'),
-     'sidebar': require('./sidebar'),
-     'page-picker': require('./page-picker'),
-     'page-comments': require('./page-comments'),
-     'wysiwyg-editor': require('./wysiwyg-editor'),
-     'markdown-editor': require('./markdown-editor'),
-     'editor-toolbox': require('./editor-toolbox'),
-     'image-picker': require('./image-picker'),
-     'collapsible': require('./collapsible'),
-     'toggle-switch': require('./toggle-switch'),
-     'page-display': require('./page-display'),
-     'shelf-sort': require('./shelf-sort'),
-     'homepage-control': require('./homepage-control'),
-     'header-mobile-toggle': require('./header-mobile-toggle'),
+ 
+ const componentMapping = {
+     'dropdown': dropdown,
+     'overlay': overlay,
+     'back-to-top': backToTop,
+     'notification': notification,
+     'chapter-toggle': chapterToggle,
+     'expand-toggle': expandToggle,
+     'entity-selector-popup': entitySelectorPopup,
+     'entity-selector': entitySelector,
+     'sidebar': sidebar,
+     'page-picker': pagePicker,
+     'page-comments': pageComments,
+     'wysiwyg-editor': wysiwygEditor,
+     'markdown-editor': markdownEditor,
+     'editor-toolbox': editorToolbox,
+     'image-picker': imagePicker,
+     'collapsible': collapsible,
+     'toggle-switch': toggleSwitch,
+     'page-display': pageDisplay,
+     'shelf-sort': shelfSort,
+     'homepage-control': homepageControl,
++     'header-mobile-toggle': headerMobileToggle,
  };
  
  window.components = {};
  
- let componentNames = Object.keys(componentMapping);
+ const componentNames = Object.keys(componentMapping);
  
  /**
   * Initialize components of the given name within the given element.
@@@ -59,4 -79,4 +81,4 @@@ function initAll(parentElement) 
  
  window.components.init = initAll;
  
--export default initAll;
++export default initAll;
diff --combined resources/assets/js/components/page-display.js
index cffaf373d,cbb672222..a76160247
--- a/resources/assets/js/components/page-display.js
+++ b/resources/assets/js/components/page-display.js
@@@ -1,4 -1,4 +1,4 @@@
- import Clipboard from "clipboard";
+ import Clipboard from "clipboard/dist/clipboard.min";
  import Code from "../services/code";
  
  class PageDisplay {
@@@ -136,7 -136,7 +136,7 @@@
  
          // Fix the tree as a sidebar
          function stickTree() {
 -            $sidebar.width($bookTreeParent.width() + 15);
 +            $sidebar.width($bookTreeParent.width() - 32);
              $sidebar.addClass("fixed");
              isFixed = true;
          }
@@@ -233,4 -233,4 +233,4 @@@
      }
  }
  
- module.exports = PageDisplay;
+ export default PageDisplay;