scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-11-11 01:44:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1307 from biosistemika/release-1.14.4

Browse source 
Merge release-1.14.4 into release-1.14.5
This commit is contained in:
Luka Murn 2018-09-19 15:29:57 +02:00 committed by GitHub
commit 32e068f298
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Gemfile
View file

@ -82,7 +82,10 @@ gem 'devise-async',
gem 'discard', '~> 1.0'
gem 'ruby-graphviz', '~> 1.2' # Graphviz for rails
gem 'tinymce-rails', '~> 4.7.13' # Rich text editor
gem 'tinymce-rails', '~> 4.7.13' # Rich text editor - SEE BELOW
# Any time you update tinymce-rails Gem, also update the cache_suffix parameter in
# sitewide/tiny_mce.js - to prevent browsers from loading old, cached .js
# TinyMCE files which might cause errors
gem 'base62' # Used for smart annotations
gem 'newrelic_rpm'

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

@ -18,6 +18,7 @@ var TinyMCE = (function() {
init : function() {
if (typeof tinyMCE != 'undefined') {
tinyMCE.init({
cache_suffix: '?v=4.7.13',
selector: 'textarea.tinymce',
toolbar: ["undo redo | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | link | forecolor backcolor | customimageuploader | codesample"],
plugins: "autoresize,customimageuploader,link,advlist,codesample,autolink,lists,charmap,hr,anchor,searchreplace,wordcount,visualblocks,visualchars,insertdatetime,nonbreaking,save,contextmenu,directionality,paste,textcolor,colorpicker,textpattern",