scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tiny mce visuals, saving and cursor position

Browse source
This commit is contained in:
Mojca Lorber 2019-05-10 10:52:14 +02:00
parent 3bb268459f
commit 8e6413b031
2 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/assets/javascripts/sitewide/tiny_mce.js vendored
View file

@ -57,6 +57,7 @@ var TinyMCE = (function() {
menubar: 'file edit view insert format', menubar: 'file edit view insert format',
toolbar: 'undo redo restoredraft | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link | forecolor backcolor | customimageuploader | codesample', toolbar: 'undo redo restoredraft | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link | forecolor backcolor | customimageuploader | codesample',
plugins: 'autosave autoresize customimageuploader link advlist codesample autolink lists charmap hr anchor searchreplace wordcount visualblocks visualchars insertdatetime nonbreaking save directionality paste textcolor colorpicker textpattern', plugins: 'autosave autoresize customimageuploader link advlist codesample autolink lists charmap hr anchor searchreplace wordcount visualblocks visualchars insertdatetime nonbreaking save directionality paste textcolor colorpicker textpattern',
autoresize_bottom_margin: 20,
codesample_languages: [ codesample_languages: [
{ text: 'R', value: 'r' }, { text: 'R', value: 'r' },
{ text: 'MATLAB', value: 'matlab' }, { text: 'MATLAB', value: 'matlab' },
@ -139,6 +140,7 @@ var TinyMCE = (function() {
$('.tinymce-placeholder').remove(); $('.tinymce-placeholder').remove();
moveToolbar(editor, editorToolbar, editorToolbaroffset); moveToolbar(editor, editorToolbar, editorToolbaroffset);
}, 400); }, 400);
// Init saved status label // Init saved status label
if (editor.getContent() !== '') { if (editor.getContent() !== '') {
editorForm.find('.tinymce-status-badge').removeClass('hidden'); editorForm.find('.tinymce-status-badge').removeClass('hidden');
@ -149,7 +151,6 @@ var TinyMCE = (function() {
moveToolbar(editor, editorToolbar, editorToolbaroffset); moveToolbar(editor, editorToolbar, editorToolbaroffset);
}); });
// Update scroll position after exit // Update scroll position after exit
function updateScrollPosition() { function updateScrollPosition() {
if (editorForm.offset().top < $(window).scrollTop()) { if (editorForm.offset().top < $(window).scrollTop()) {
@ -157,6 +158,16 @@ var TinyMCE = (function() {
} }
} }
// Saving at clicking anywhere outside of the editor
editor.on('blur', function(event) {
event.preventDefault();
editorForm.clearFormErrors();
editor.setProgressState(1);
editor.save();
editorForm.submit();
updateScrollPosition();
});
// Init Save button // Init Save button
editorForm editorForm
.find('.tinymce-save-button') .find('.tinymce-save-button')
@ -202,6 +213,11 @@ var TinyMCE = (function() {
}) })
.removeClass('hidden'); .removeClass('hidden');
// Set cursor to the end of the content
editor.focus();
editor.selection.select(editor.getBody(), true);
editor.selection.collapse(false);
SmartAnnotation.init($(editor.contentDocument.activeElement)); SmartAnnotation.init($(editor.contentDocument.activeElement));
initHighlightjsIframe($(this.iframeElement).contents()); initHighlightjsIframe($(this.iframeElement).contents());
}, },

8
app/assets/stylesheets/tiny_mce.scss
View file

@ -4,12 +4,12 @@
.tinymce-view { .tinymce-view {
border: solid 1px; border: solid 1px;
border-color: $color-white; border-color: $color-white;
box-shadow: 1px 0 2px $color-alto; border-radius: 3px;
min-height: 200px; min-height: 100px;
padding: 3px; padding: 3px;
&:hover { &:hover {
border-color: $color-alto; border-color: $color-gainsboro;
cursor: pointer; cursor: pointer;
} }
@ -59,4 +59,4 @@
.mce-toolbar { .mce-toolbar {
background: $color-white !important; background: $color-white !important;
} }
// scss-lint:enable ImportantRule // scss-lint:enable ImportantRule