scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 13:28:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #455 from mlorb/ml_sci_944

Browse source 
Fix entering new smart anotations [SCI-944]
This commit is contained in:
Luka Murn 2017-01-26 14:06:35 +01:00 • committed by GitHub
commit 3e6d11a087
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/tiny_mce.js.erb
View file

@ -63,7 +63,7 @@ var TinyMCE = (function() {
initHighlightjsIframe($(this.iframeElement).contents()); initHighlightjsIframe($(this.iframeElement).contents());
}, },
setup: function(editor) { setup: function(editor) {
editor.on('Change', function(e) { editor.on('keydown', function(e) {
if(e.keyCode == 13 && $(editor.contentDocument.activeElement).atwho('isSelecting')) { if(e.keyCode == 13 && $(editor.contentDocument.activeElement).atwho('isSelecting')) {
return false; return false;
} }