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

Fix merge

Browse source
This commit is contained in:
Anton Ignatov 2019-05-11 20:54:52 +02:00
parent e5b4adcc25
commit 65eff67926
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -227,13 +227,9 @@ var TinyMCE = (function() {
moveToolbar(editor, editorToolbar, editorToolbaroffset);
});
<<<<<<< HEAD
// Init image toolbar
initImageToolBar(editor);
=======
>>>>>>> master-with-note-section
// Update scroll position after exit
function updateScrollPosition() {
if (editorForm.offset().top < $(window).scrollTop()) {