Skip to content

Commit

Permalink
Fix Edge encoding bug when pasting text into the HTML editor, update …
Browse files Browse the repository at this point in the history
…to TinyMCE 4.5.8 (#5885)
  • Loading branch information
alecpl committed Oct 12, 2017
1 parent 1bb9797 commit 8ba12b0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ CHANGELOG Roundcube Webmail
- Fix bug where assets_path wasn't added to some watermark frames
- Fix so untagged COPYUID responses are also supported according to RFC6851 (#5982)
- Fix issue caused by non-default session.cookie_lifetime setting (#5961)
- Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)

RELEASE 1.3.1
-------------
Expand Down
8 changes: 4 additions & 4 deletions jsdeps.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
},
{
"lib": "tinymce",
"version": "4.5.7",
"url": "http://download.ephox.com/tinymce/community/tinymce_4.5.7.zip",
"version": "4.5.8",
"url": "http://download.ephox.com/tinymce/community/tinymce_4.5.8.zip",
"dest": "program/js",
"sha1": "4e86907c4748f7f75072e173ff3eee08700b9594",
"sha1": "08b0757264adb86066940bbafb7aa9ec0c7c6685",
"license": "LGPL",
"copyright": "Copyright (c) 1999-2015 Ephox Corp. All rights reserved",
"rm": "program/js/tinymce",
Expand All @@ -55,7 +55,7 @@
},
{
"lib": "tinymce-langs",
"version": "4.5.7",
"version": "4.5.8",
"url": "https://tinymce-services.azurewebsites.net/1/i18n/download?langs=ar,hy,az,eu,be,bs,bg_BG,ca,zh_CN,zh_TW,hr,cs,cs_CZ,da,nl,en_CA,en_GB,eo,et,fo,fi,fr_FR,fr_CH,gd,gl,ka_GE,de,de_AT,el,he_IL,hi_IN,hu_HU,is_IS,id,ga,it,ja,kab,km_KH,ko_KR,ku,ku_IQ,lv,lt,lb,mk_MK,ml_IN,nb_NO,oc,fa,fa_IR,pl,pt_BR,pt_PT,ro,ru,sk,sl_SI,es,es_MX,sv_SE,tg,ta,ta_IN,tt,th_TH,tr,tr_TR,ug,uk,uk_UA,vi,vi_VN,cy",
"dest": "program/js/tinymce"
},
Expand Down
2 changes: 1 addition & 1 deletion program/js/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function rcube_text_editor(config, id)
abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
conf = {
selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
cache_suffix: 's=4050700',
cache_suffix: 's=4050800',
theme: 'modern',
language: config.lang,
content_css: rcmail.assets_path('program/resources/tinymce/content.css'),
Expand Down

0 comments on commit 8ba12b0

Please sign in to comment.