github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-23 10:41:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added custom, More consistent hr insertion

Browse Source 
Since the previous hr plugin caused large empty p tags
This commit is contained in:
Dan Brown 2016-04-23 19:15:49 +01:00
parent 8b36ca95a3
commit 2dc1180a41
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
resources/assets/js/directives.js
View File

@ -198,6 +198,30 @@ module.exports = function (ngApp, events) {
} }
scope.tinymce.extraSetups.push(tinyMceSetup); scope.tinymce.extraSetups.push(tinyMceSetup);
// Custom tinyMCE plugins
tinymce.PluginManager.add('customhr', function(editor) {
editor.addCommand('InsertHorizontalRule', function() {
var hrElem = document.createElement('hr');
var cNode = editor.selection.getNode();
var parentNode = cNode.parentNode;
parentNode.insertBefore(hrElem, cNode);
});
editor.addButton('hr', {
icon: 'hr',
tooltip: 'Horizontal line',
cmd: 'InsertHorizontalRule'
});
editor.addMenuItem('hr', {
icon: 'hr',
text: 'Horizontal line',
cmd: 'InsertHorizontalRule',
context: 'insert'
});
});
tinymce.init(scope.tinymce); tinymce.init(scope.tinymce);
} }
} }

2
resources/assets/js/pages/page-form.js
View File

@ -11,7 +11,7 @@ var mceOptions = module.exports = {
extended_valid_elements: 'pre[*]', extended_valid_elements: 'pre[*]',
automatic_uploads: false, automatic_uploads: false,
valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]", valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
plugins: "image table textcolor paste link fullscreen imagetools code hr autosave lists", plugins: "image table textcolor paste link fullscreen imagetools code customhr autosave lists",
imagetools_toolbar: 'imageoptions', imagetools_toolbar: 'imageoptions',
toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen", toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image-insert link hr | removeformat code fullscreen",
content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}", content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",